summaryrefslogtreecommitdiffstats
path: root/src/Items/ItemBucket.h
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-03-23 23:32:45 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-03-23 23:32:45 +0100
commitf622f4317c76aa287649da965456562a32bce41b (patch)
treec4bb86026ec7565b090c03a07840c13d067c534a /src/Items/ItemBucket.h
parentFixed bad cmake document interpretation (diff)
downloadcuberite-f622f4317c76aa287649da965456562a32bce41b.tar
cuberite-f622f4317c76aa287649da965456562a32bce41b.tar.gz
cuberite-f622f4317c76aa287649da965456562a32bce41b.tar.bz2
cuberite-f622f4317c76aa287649da965456562a32bce41b.tar.lz
cuberite-f622f4317c76aa287649da965456562a32bce41b.tar.xz
cuberite-f622f4317c76aa287649da965456562a32bce41b.tar.zst
cuberite-f622f4317c76aa287649da965456562a32bce41b.zip
Diffstat (limited to 'src/Items/ItemBucket.h')
-rw-r--r--src/Items/ItemBucket.h8
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;