diff options
| author | worktycho <work.tycho@gmail.com> | 2014-03-30 16:17:35 +0200 |
|---|---|---|
| committer | worktycho <work.tycho@gmail.com> | 2014-03-30 16:17:35 +0200 |
| commit | 5260146f3c5d26c5583a8034eb8b342218a836d7 (patch) | |
| tree | df19e59ec8716ac98d0926826c3207348809d750 /src/Items/ItemBucket.h | |
| parent | cPrefab now uses a struct for block type definition in CharMap. (diff) | |
| parent | Another curly (diff) | |
| download | cuberite-5260146f3c5d26c5583a8034eb8b342218a836d7.tar cuberite-5260146f3c5d26c5583a8034eb8b342218a836d7.tar.gz cuberite-5260146f3c5d26c5583a8034eb8b342218a836d7.tar.bz2 cuberite-5260146f3c5d26c5583a8034eb8b342218a836d7.tar.lz cuberite-5260146f3c5d26c5583a8034eb8b342218a836d7.tar.xz cuberite-5260146f3c5d26c5583a8034eb8b342218a836d7.tar.zst cuberite-5260146f3c5d26c5583a8034eb8b342218a836d7.zip | |
Diffstat (limited to 'src/Items/ItemBucket.h')
| -rw-r--r-- | src/Items/ItemBucket.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Items/ItemBucket.h b/src/Items/ItemBucket.h index 72cb8fa0a..68c89dd85 100644 --- a/src/Items/ItemBucket.h +++ b/src/Items/ItemBucket.h @@ -172,12 +172,12 @@ public: virtual bool OnNextBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, char a_EntryFace) override { - if (a_BlockMeta != 0) // Even if it was a water block it would not be a source. - { - return false; - } if (IsBlockWater(a_BlockType) || IsBlockLava(a_BlockType)) { + if (a_BlockMeta != 0) // GetBlockFromTrace is called for scooping up fluids; the hit block should be a source + { + return false; + } m_HasHitFluid = true; m_Pos.Set(a_BlockX, a_BlockY, a_BlockZ); return true; |