diff options
| author | Mattes D <github@xoft.cz> | 2015-01-18 18:01:24 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-01-18 18:01:24 +0100 |
| commit | 45b1d5ff78e23b3de9cbee1e247e2f275b77e9d9 (patch) | |
| tree | 9c21fb0419d1eb0dfab999daad2ec7e77329cf62 /src/Items/ItemBucket.h | |
| parent | cWorld: Fixed a type warning. (diff) | |
| download | cuberite-45b1d5ff78e23b3de9cbee1e247e2f275b77e9d9.tar cuberite-45b1d5ff78e23b3de9cbee1e247e2f275b77e9d9.tar.gz cuberite-45b1d5ff78e23b3de9cbee1e247e2f275b77e9d9.tar.bz2 cuberite-45b1d5ff78e23b3de9cbee1e247e2f275b77e9d9.tar.lz cuberite-45b1d5ff78e23b3de9cbee1e247e2f275b77e9d9.tar.xz cuberite-45b1d5ff78e23b3de9cbee1e247e2f275b77e9d9.tar.zst cuberite-45b1d5ff78e23b3de9cbee1e247e2f275b77e9d9.zip | |
Diffstat (limited to 'src/Items/ItemBucket.h')
| -rw-r--r-- | src/Items/ItemBucket.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Items/ItemBucket.h b/src/Items/ItemBucket.h index 3a533958f..871db821c 100644 --- a/src/Items/ItemBucket.h +++ b/src/Items/ItemBucket.h @@ -199,16 +199,16 @@ public: Vector3i m_Pos; BLOCKTYPE m_ReplacedBlock; - virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) override + virtual bool OnNextBlock(int a_CBBlockX, int a_CBBlockY, int a_CBBlockZ, BLOCKTYPE a_CBBlockType, NIBBLETYPE a_CBBlockMeta, char a_CBEntryFace) override { - if (a_BlockType != E_BLOCK_AIR) + if (a_CBBlockType != E_BLOCK_AIR) { - m_ReplacedBlock = a_BlockType; - if (!cFluidSimulator::CanWashAway(a_BlockType) && !IsBlockLiquid(a_BlockType)) + m_ReplacedBlock = a_CBBlockType; + if (!cFluidSimulator::CanWashAway(a_CBBlockType) && !IsBlockLiquid(a_CBBlockType)) { - AddFaceDirection(a_BlockX, a_BlockY, a_BlockZ, (eBlockFace)a_EntryFace); // Was an unwashawayable block, can't overwrite it! + AddFaceDirection(a_CBBlockX, a_CBBlockY, a_CBBlockZ, (eBlockFace)a_CBEntryFace); // Was an unwashawayable block, can't overwrite it! } - m_Pos.Set(a_BlockX, a_BlockY, a_BlockZ); // (Block could be washed away, replace it) + m_Pos.Set(a_CBBlockX, a_CBBlockY, a_CBBlockZ); // (Block could be washed away, replace it) return true; // Abort tracing } return false; |