summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-02-03 23:55:15 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-02-03 23:55:15 +0100
commitd1b5f0859a4176a31f764b23cf0fce49743d245e (patch)
tree0d46f77d5a1954548faf404f8cf04e9a29800df6
parentMerge pull request #636 from worktycho/warningfixes (diff)
downloadcuberite-d1b5f0859a4176a31f764b23cf0fce49743d245e.tar
cuberite-d1b5f0859a4176a31f764b23cf0fce49743d245e.tar.gz
cuberite-d1b5f0859a4176a31f764b23cf0fce49743d245e.tar.bz2
cuberite-d1b5f0859a4176a31f764b23cf0fce49743d245e.tar.lz
cuberite-d1b5f0859a4176a31f764b23cf0fce49743d245e.tar.xz
cuberite-d1b5f0859a4176a31f764b23cf0fce49743d245e.tar.zst
cuberite-d1b5f0859a4176a31f764b23cf0fce49743d245e.zip
-rw-r--r--src/ChunkMap.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index 1e2181f32..757396a20 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -1808,7 +1808,7 @@ void cChunkMap::DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_
if (FinalDamage > a_Entity->GetMaxHealth())
FinalDamage = a_Entity->GetMaxHealth();
else if (FinalDamage < 0)
- return false;
+ FinalDamage = 0;
if (!a_Entity->IsTNT()) // Don't apply damage to other TNT entities, they should be invincible
{