diff options
| author | madmaxoft <github@xoft.cz> | 2014-09-03 10:29:10 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-09-03 10:29:10 +0200 |
| commit | 1cc65b626462ca3e5aff1619e51450b5d33ff717 (patch) | |
| tree | ea2586d669fbb609b3694aea685a21c3eb93cca8 /src/Entities | |
| parent | Quick fix for a preprocessor error with clang on OS X (diff) | |
| download | cuberite-1cc65b626462ca3e5aff1619e51450b5d33ff717.tar cuberite-1cc65b626462ca3e5aff1619e51450b5d33ff717.tar.gz cuberite-1cc65b626462ca3e5aff1619e51450b5d33ff717.tar.bz2 cuberite-1cc65b626462ca3e5aff1619e51450b5d33ff717.tar.lz cuberite-1cc65b626462ca3e5aff1619e51450b5d33ff717.tar.xz cuberite-1cc65b626462ca3e5aff1619e51450b5d33ff717.tar.zst cuberite-1cc65b626462ca3e5aff1619e51450b5d33ff717.zip | |
Diffstat (limited to 'src/Entities')
| -rw-r--r-- | src/Entities/Entity.cpp | 4 | ||||
| -rw-r--r-- | src/Entities/EntityEffect.cpp | 4 |
2 files changed, 4 insertions, 4 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; diff --git a/src/Entities/EntityEffect.cpp b/src/Entities/EntityEffect.cpp index a33955a6a..f08755674 100644 --- a/src/Entities/EntityEffect.cpp +++ b/src/Entities/EntityEffect.cpp @@ -34,11 +34,11 @@ cEntityEffect::eType cEntityEffect::GetPotionEffectType(short a_ItemDamage) case 0x08: return cEntityEffect::effWeakness; case 0x09: return cEntityEffect::effStrength; case 0x0a: return cEntityEffect::effSlowness; - case 0x0b: return cEntityEffect::effJumpBoost; + case 0x0b: return cEntityEffect::effJumpBoost; case 0x0c: return cEntityEffect::effInstantDamage; case 0x0d: return cEntityEffect::effWaterBreathing; case 0x0e: return cEntityEffect::effInvisibility; - + // No effect potions case 0x00: case 0x07: |