diff options
author | x12xx12x <44411062+12xx12@users.noreply.github.com> | 2022-04-20 00:10:35 +0200 |
---|---|---|
committer | Alexander Harkness <me@bearbin.net> | 2022-04-20 09:41:02 +0200 |
commit | fe983a1a45b23c67cf6c758a4f0ffe6a8ba764d6 (patch) | |
tree | a5c9f00728af0f2ca841bb5d881b8d0d785b24ae /src/Items | |
parent | Updated protocol functions to Vector3x (diff) | |
download | cuberite-fe983a1a45b23c67cf6c758a4f0ffe6a8ba764d6.tar cuberite-fe983a1a45b23c67cf6c758a4f0ffe6a8ba764d6.tar.gz cuberite-fe983a1a45b23c67cf6c758a4f0ffe6a8ba764d6.tar.bz2 cuberite-fe983a1a45b23c67cf6c758a4f0ffe6a8ba764d6.tar.lz cuberite-fe983a1a45b23c67cf6c758a4f0ffe6a8ba764d6.tar.xz cuberite-fe983a1a45b23c67cf6c758a4f0ffe6a8ba764d6.tar.zst cuberite-fe983a1a45b23c67cf6c758a4f0ffe6a8ba764d6.zip |
Diffstat (limited to 'src/Items')
-rw-r--r-- | src/Items/ItemBoat.h | 2 | ||||
-rw-r--r-- | src/Items/ItemDye.h | 2 | ||||
-rw-r--r-- | src/Items/ItemHandler.cpp | 2 | ||||
-rw-r--r-- | src/Items/ItemLighter.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/Items/ItemBoat.h b/src/Items/ItemBoat.h index 51f2f8803..4fc041787 100644 --- a/src/Items/ItemBoat.h +++ b/src/Items/ItemBoat.h @@ -70,7 +70,7 @@ public: // Block above must be air to spawn a boat (prevents spawning a boat underwater) auto PosAbove = Callbacks.m_Pos.Floor().addedY(1); - if (!cChunkDef::IsValidHeight(PosAbove.y)) + if (!cChunkDef::IsValidHeight(PosAbove)) { return false; } diff --git a/src/Items/ItemDye.h b/src/Items/ItemDye.h index 5b0081b45..e6beca084 100644 --- a/src/Items/ItemDye.h +++ b/src/Items/ItemDye.h @@ -365,7 +365,7 @@ public: ) { if ( - !cChunkDef::IsValidHeight(Position.y) || + !cChunkDef::IsValidHeight(Position) || (a_World.GetBlock(Position) != E_BLOCK_GRASS) // Are we looking at grass? ) { diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp index 67d4b2a43..70980b786 100644 --- a/src/Items/ItemHandler.cpp +++ b/src/Items/ItemHandler.cpp @@ -1063,7 +1063,7 @@ void cItemHandler::OnPlayerPlace(cPlayer & a_Player, const cItem & a_HeldItem, c NIBBLETYPE PlaceMeta; const auto PlacePosition = AddFaceDirection(a_ClickedPosition, a_ClickedBlockFace); - if (!cChunkDef::IsValidHeight(PlacePosition.y) || !World.GetBlockTypeMeta(PlacePosition, PlaceBlock, PlaceMeta)) + if (!cChunkDef::IsValidHeight(PlacePosition) || !World.GetBlockTypeMeta(PlacePosition, PlaceBlock, PlaceMeta)) { // The block is being placed outside the world, ignore this packet altogether (GH #128): return; diff --git a/src/Items/ItemLighter.h b/src/Items/ItemLighter.h index 3e7d3e78f..2402dd0e1 100644 --- a/src/Items/ItemLighter.h +++ b/src/Items/ItemLighter.h @@ -57,7 +57,7 @@ public: } const auto FirePos = AddFaceDirection(a_ClickedBlockPos, a_ClickedBlockFace); - if (!cChunkDef::IsValidHeight(FirePos.y)) + if (!cChunkDef::IsValidHeight(FirePos)) { return false; } |