summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.cpp
diff options
context:
space:
mode:
authorMasy98 <masy@antheruscraft.de>2014-09-06 22:06:40 +0200
committerMasy98 <masy@antheruscraft.de>2014-09-06 22:06:40 +0200
commit9cdb9b6262a0d6ffb9f83c20ca3c9483fb245aaa (patch)
tree500cd7ff84cbf42e34eb95225e83c3f18c4258c0 /src/Entities/Entity.cpp
parentFixed typo! (diff)
parentMerge remote-tracking branch 'upstream/master' (diff)
downloadcuberite-9cdb9b6262a0d6ffb9f83c20ca3c9483fb245aaa.tar
cuberite-9cdb9b6262a0d6ffb9f83c20ca3c9483fb245aaa.tar.gz
cuberite-9cdb9b6262a0d6ffb9f83c20ca3c9483fb245aaa.tar.bz2
cuberite-9cdb9b6262a0d6ffb9f83c20ca3c9483fb245aaa.tar.lz
cuberite-9cdb9b6262a0d6ffb9f83c20ca3c9483fb245aaa.tar.xz
cuberite-9cdb9b6262a0d6ffb9f83c20ca3c9483fb245aaa.tar.zst
cuberite-9cdb9b6262a0d6ffb9f83c20ca3c9483fb245aaa.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Entity.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 89d1cffa1..9bcdcffeb 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -387,7 +387,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
case cMonster::mtGhast:
case cMonster::mtZombiePigman:
case cMonster::mtMagmaCube:
- {
+ {
break;
};
default: StartBurning(BurnTicks * 20);
@@ -417,7 +417,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
}
if (!Player->IsOnGround())
- {
+ {
if ((a_TDI.DamageType == dtAttack) || (a_TDI.DamageType == dtArrowAttack))
{
a_TDI.FinalDamage += 2;