summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Pioch <lukas@zgow.de>2016-02-18 08:11:08 +0100
committerLukas Pioch <lukas@zgow.de>2016-02-18 08:16:34 +0100
commitdc4ea39755063dd02449373dbdd8b9eb3444219d (patch)
treed97b8840390f65304ffa7ef4769f27b9f75846fa
parentMerge pull request #3009 from marvinkopf/pushing (diff)
downloadcuberite-dc4ea39755063dd02449373dbdd8b9eb3444219d.tar
cuberite-dc4ea39755063dd02449373dbdd8b9eb3444219d.tar.gz
cuberite-dc4ea39755063dd02449373dbdd8b9eb3444219d.tar.bz2
cuberite-dc4ea39755063dd02449373dbdd8b9eb3444219d.tar.lz
cuberite-dc4ea39755063dd02449373dbdd8b9eb3444219d.tar.xz
cuberite-dc4ea39755063dd02449373dbdd8b9eb3444219d.tar.zst
cuberite-dc4ea39755063dd02449373dbdd8b9eb3444219d.zip
Diffstat (limited to '')
-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);
}