summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulian Laubstein <julianlaubstein@yahoo.de>2016-02-18 08:45:20 +0100
committerJulian Laubstein <julianlaubstein@yahoo.de>2016-02-18 08:45:20 +0100
commit4f055560289c96a9b2dc6b5d478ffe15f4df8f6f (patch)
treed97b8840390f65304ffa7ef4769f27b9f75846fa
parentMerge pull request #3009 from marvinkopf/pushing (diff)
parentDon't remove water after ice block has been destroyed (diff)
downloadcuberite-4f055560289c96a9b2dc6b5d478ffe15f4df8f6f.tar
cuberite-4f055560289c96a9b2dc6b5d478ffe15f4df8f6f.tar.gz
cuberite-4f055560289c96a9b2dc6b5d478ffe15f4df8f6f.tar.bz2
cuberite-4f055560289c96a9b2dc6b5d478ffe15f4df8f6f.tar.lz
cuberite-4f055560289c96a9b2dc6b5d478ffe15f4df8f6f.tar.xz
cuberite-4f055560289c96a9b2dc6b5d478ffe15f4df8f6f.tar.zst
cuberite-4f055560289c96a9b2dc6b5d478ffe15f4df8f6f.zip
-rw-r--r--src/ClientHandle.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index df85d9b67..fca29c65d 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -1246,7 +1246,11 @@ void cClientHandle::HandleBlockDigFinished(int a_BlockX, int a_BlockY, int a_Blo
cChunkInterface ChunkInterface(World->GetChunkMap());
BlockHandler(a_OldBlock)->OnDestroyedByPlayer(ChunkInterface, *World, m_Player, a_BlockX, a_BlockY, a_BlockZ);
World->BroadcastSoundParticleEffect(EffectID::PARTICLE_SMOKE, a_BlockX, a_BlockY, a_BlockZ, a_OldBlock, this);
- World->DigBlock(a_BlockX, a_BlockY, a_BlockZ);
+ // This call would remove the water, placed from the ice block handler
+ if (a_OldBlock != E_BLOCK_ICE)
+ {
+ World->DigBlock(a_BlockX, a_BlockY, a_BlockZ);
+ }
cRoot::Get()->GetPluginManager()->CallHookPlayerBrokenBlock(*m_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_OldBlock, a_OldMeta);
}