diff options
Diffstat (limited to 'src/Items/ItemBucket.h')
| -rw-r--r-- | src/Items/ItemBucket.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Items/ItemBucket.h b/src/Items/ItemBucket.h index 4d39bde82..180a363ec 100644 --- a/src/Items/ItemBucket.h +++ b/src/Items/ItemBucket.h @@ -42,9 +42,9 @@ public: } } } - - - + + + bool ScoopUpFluid(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) { if (a_BlockFace != BLOCK_FACE_NONE) @@ -79,7 +79,7 @@ public: { return false; } - + // Check to see if destination block is too far away // Reach Distance Multiplayer = 5 Blocks if ((BlockPos.x - a_Player->GetPosX() > 5) || (BlockPos.z - a_Player->GetPosZ() > 5)) @@ -124,7 +124,7 @@ public: { return false; } - + BLOCKTYPE CurrentBlockType; NIBBLETYPE CurrentBlockMeta; eBlockFace EntryFace; @@ -140,7 +140,7 @@ public: { return false; } - + if (a_Player->GetGameMode() != gmCreative) { // Remove fluid bucket, add empty bucket: @@ -156,7 +156,7 @@ public: return false; } } - + // Wash away anything that was there prior to placing: if (cFluidSimulator::CanWashAway(CurrentBlockType)) { @@ -189,13 +189,13 @@ public: public: Vector3i m_Pos; bool m_HasHitFluid; - + cCallbacks(void) : m_HasHitFluid(false) { } - + virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) override { if (IsBlockWater(a_BlockType) || IsBlockLava(a_BlockType)) @@ -227,8 +227,8 @@ public: a_BlockPos = Callbacks.m_Pos; return true; } - - + + bool GetPlacementCoordsFromTrace(cWorld * a_World, cPlayer * a_Player, Vector3i & a_BlockPos, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta, eBlockFace & a_BlockFace) { @@ -240,7 +240,7 @@ public: BLOCKTYPE m_ReplacedBlockType; NIBBLETYPE m_ReplacedBlockMeta; eBlockFace m_EntryFace; - + virtual bool OnNextBlock(int a_CBBlockX, int a_CBBlockY, int a_CBBlockZ, BLOCKTYPE a_CBBlockType, NIBBLETYPE a_CBBlockMeta, char a_CBEntryFace) override { if (a_CBBlockType != E_BLOCK_AIR) |