diff options
| author | Mattes D <github@xoft.cz> | 2015-01-22 14:33:36 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-01-22 14:33:36 +0100 |
| commit | f36a00c6037fb4ab2a5d78dbebefa067685f9f63 (patch) | |
| tree | f0ea4baa88699ac537a0f671b503d4993376927d /src/Items | |
| parent | Fixed type conversion warnings. (diff) | |
| parent | Fixed warnings in StringUtils. (diff) | |
| download | cuberite-f36a00c6037fb4ab2a5d78dbebefa067685f9f63.tar cuberite-f36a00c6037fb4ab2a5d78dbebefa067685f9f63.tar.gz cuberite-f36a00c6037fb4ab2a5d78dbebefa067685f9f63.tar.bz2 cuberite-f36a00c6037fb4ab2a5d78dbebefa067685f9f63.tar.lz cuberite-f36a00c6037fb4ab2a5d78dbebefa067685f9f63.tar.xz cuberite-f36a00c6037fb4ab2a5d78dbebefa067685f9f63.tar.zst cuberite-f36a00c6037fb4ab2a5d78dbebefa067685f9f63.zip | |
Diffstat (limited to 'src/Items')
| -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; |