summaryrefslogtreecommitdiffstats
path: root/src/Items
diff options
context:
space:
mode:
authorZach DeCook <zachdecook@gmail.com>2019-05-07 21:15:58 +0200
committerpeterbell10 <peterbell10@live.co.uk>2019-05-07 21:15:58 +0200
commitb9e7505d7f275423a930f1d68cfc666b19b2551a (patch)
treec06e15bf183b4ee0aebfb7cfb2af6dff1e52712c /src/Items
parentFix player skin sending through BungeeCord (#4328) (diff)
downloadcuberite-b9e7505d7f275423a930f1d68cfc666b19b2551a.tar
cuberite-b9e7505d7f275423a930f1d68cfc666b19b2551a.tar.gz
cuberite-b9e7505d7f275423a930f1d68cfc666b19b2551a.tar.bz2
cuberite-b9e7505d7f275423a930f1d68cfc666b19b2551a.tar.lz
cuberite-b9e7505d7f275423a930f1d68cfc666b19b2551a.tar.xz
cuberite-b9e7505d7f275423a930f1d68cfc666b19b2551a.tar.zst
cuberite-b9e7505d7f275423a930f1d68cfc666b19b2551a.zip
Diffstat (limited to 'src/Items')
-rw-r--r--src/Items/ItemBucket.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Items/ItemBucket.h b/src/Items/ItemBucket.h
index f45dbae3e..f5acb25b3 100644
--- a/src/Items/ItemBucket.h
+++ b/src/Items/ItemBucket.h
@@ -242,12 +242,12 @@ public:
virtual bool OnNextBlock(int a_CBBlockX, int a_CBBlockY, int a_CBBlockZ, BLOCKTYPE a_CBBlockType, NIBBLETYPE a_CBBlockMeta, eBlockFace a_CBEntryFace) override
{
- if (a_CBBlockType != E_BLOCK_AIR)
+ if ((a_CBBlockType != E_BLOCK_AIR) && !IsBlockLiquid(a_CBBlockType))
{
m_ReplacedBlockType = a_CBBlockType;
m_ReplacedBlockMeta = a_CBBlockMeta;
m_EntryFace = static_cast<eBlockFace>(a_CBEntryFace);
- if (!cFluidSimulator::CanWashAway(a_CBBlockType) && !IsBlockLiquid(a_CBBlockType))
+ if (!cFluidSimulator::CanWashAway(a_CBBlockType))
{
AddFaceDirection(a_CBBlockX, a_CBBlockY, a_CBBlockZ, a_CBEntryFace); // Was an unwashawayable block, can't overwrite it!
}