summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorElNounch <ElNounch@users.noreply.github.com>2016-08-28 07:18:32 +0200
committerLogicParrot <LogicParrot@users.noreply.github.com>2016-08-28 07:18:32 +0200
commit40b929c02ea05ea046d890829a7f1b05b2717e25 (patch)
tree37bdb4d7d624a8ee2c31d8f5decce6404ed55348 /src
parentMerge pull request #3346 from cuberite/FixWarnings (diff)
downloadcuberite-40b929c02ea05ea046d890829a7f1b05b2717e25.tar
cuberite-40b929c02ea05ea046d890829a7f1b05b2717e25.tar.gz
cuberite-40b929c02ea05ea046d890829a7f1b05b2717e25.tar.bz2
cuberite-40b929c02ea05ea046d890829a7f1b05b2717e25.tar.lz
cuberite-40b929c02ea05ea046d890829a7f1b05b2717e25.tar.xz
cuberite-40b929c02ea05ea046d890829a7f1b05b2717e25.tar.zst
cuberite-40b929c02ea05ea046d890829a7f1b05b2717e25.zip
Diffstat (limited to '')
-rw-r--r--src/Blocks/BlockIce.h3
-rw-r--r--src/ClientHandle.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/Blocks/BlockIce.h b/src/Blocks/BlockIce.h
index aae190036..633b00e51 100644
--- a/src/Blocks/BlockIce.h
+++ b/src/Blocks/BlockIce.h
@@ -38,8 +38,7 @@ public:
return;
}
- a_ChunkInterface.FastSetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_WATER, 0);
- // This is called later than the real destroying of this ice block
+ a_ChunkInterface.SetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_WATER, 0);
}
}
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 7dbf5a0a4..c44b8195b 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -1267,7 +1267,7 @@ void cClientHandle::HandleBlockDigFinished(int a_BlockX, int a_BlockY, int a_Blo
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);
// This call would remove the water, placed from the ice block handler
- if (a_OldBlock != E_BLOCK_ICE)
+ if (!((a_OldBlock == E_BLOCK_ICE) && (ChunkInterface.GetBlock(a_BlockX, a_BlockY, a_BlockZ) == E_BLOCK_WATER)))
{
World->DigBlock(a_BlockX, a_BlockY, a_BlockZ);
}