diff options
author | madmaxoft <github@xoft.cz> | 2014-07-17 22:59:02 +0200 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2014-07-17 23:16:54 +0200 |
commit | d0cc9aedb3e63d39324c52b6385406f362ab41b7 (patch) | |
tree | 20aed08f8932927b94735cf6d996f7d6ea375f46 /src/Items | |
parent | Player.cpp: Fixed compile error (diff) | |
download | cuberite-d0cc9aedb3e63d39324c52b6385406f362ab41b7.tar cuberite-d0cc9aedb3e63d39324c52b6385406f362ab41b7.tar.gz cuberite-d0cc9aedb3e63d39324c52b6385406f362ab41b7.tar.bz2 cuberite-d0cc9aedb3e63d39324c52b6385406f362ab41b7.tar.lz cuberite-d0cc9aedb3e63d39324c52b6385406f362ab41b7.tar.xz cuberite-d0cc9aedb3e63d39324c52b6385406f362ab41b7.tar.zst cuberite-d0cc9aedb3e63d39324c52b6385406f362ab41b7.zip |
Diffstat (limited to 'src/Items')
-rw-r--r-- | src/Items/ItemBucket.h | 8 | ||||
-rw-r--r-- | src/Items/ItemHandler.h | 2 | ||||
-rw-r--r-- | src/Items/ItemSeeds.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/Items/ItemBucket.h b/src/Items/ItemBucket.h index 4cdfab0fe..6d7926fa4 100644 --- a/src/Items/ItemBucket.h +++ b/src/Items/ItemBucket.h @@ -94,7 +94,7 @@ public: bool PlaceFluid(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, BLOCKTYPE a_FluidBlock) - { + { if (a_BlockFace != BLOCK_FACE_NONE) { return false; @@ -209,14 +209,14 @@ public: } m_Pos.Set(a_BlockX, a_BlockY, a_BlockZ); // (Block could be washed away, replace it) return true; // Abort tracing - } + } return false; } } Callbacks; cLineBlockTracer Tracer(*a_World, Callbacks); Vector3d Start(a_Player->GetEyePosition()); - Vector3d End(a_Player->GetEyePosition() + a_Player->GetLookVector() * 5); + Vector3d End(a_Player->GetEyePosition() + a_Player->GetLookVector() * 5); // cTracer::Trace returns true when whole line was traversed. By returning true when we hit something, we ensure that this never happens if liquid could be placed // Use this to judge whether the position is valid @@ -227,6 +227,6 @@ public: return true; } - return false; + return false; } }; diff --git a/src/Items/ItemHandler.h b/src/Items/ItemHandler.h index 3ea04d1cb..c7362c5f4 100644 --- a/src/Items/ItemHandler.h +++ b/src/Items/ItemHandler.h @@ -91,7 +91,7 @@ public: /** Can the anvil repair this item, when a_Item is the second input? */ virtual bool CanRepairWithRawMaterial(short a_ItemType); - /** Called before a block is placed into a world. + /** Called before a block is placed into a world. The handler should return true to allow placement, false to refuse. Also, the handler should set a_BlockType and a_BlockMeta to correct values for the newly placed block. */ diff --git a/src/Items/ItemSeeds.h b/src/Items/ItemSeeds.h index 4c9e82ae0..54a1183d7 100644 --- a/src/Items/ItemSeeds.h +++ b/src/Items/ItemSeeds.h @@ -40,7 +40,7 @@ public: case E_ITEM_CARROT: return FoodInfo(4, 4.8); case E_ITEM_POTATO: return FoodInfo(1, 0.6); default: return FoodInfo(0, 0); - } + } } virtual bool GetPlacementBlockTypeMeta( |