diff options
author | Masy98 <masy@antheruscraft.de> | 2014-09-05 11:27:21 +0200 |
---|---|---|
committer | Masy98 <masy@antheruscraft.de> | 2014-09-05 11:27:21 +0200 |
commit | 15bee41a3657498e0072007e24abec50aac2c8df (patch) | |
tree | 863ae0ba1fef38d5da79aeb357e955c52d838caa /src/Entities | |
parent | Added new recipes! (diff) | |
parent | Merge pull request #1375 from mc-server/EntitiesInBox (diff) | |
download | cuberite-15bee41a3657498e0072007e24abec50aac2c8df.tar cuberite-15bee41a3657498e0072007e24abec50aac2c8df.tar.gz cuberite-15bee41a3657498e0072007e24abec50aac2c8df.tar.bz2 cuberite-15bee41a3657498e0072007e24abec50aac2c8df.tar.lz cuberite-15bee41a3657498e0072007e24abec50aac2c8df.tar.xz cuberite-15bee41a3657498e0072007e24abec50aac2c8df.tar.zst cuberite-15bee41a3657498e0072007e24abec50aac2c8df.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 3e28392f4..f08755674 100644 --- a/src/Entities/EntityEffect.cpp +++ b/src/Entities/EntityEffect.cpp @@ -34,14 +34,14 @@ 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 0x0c: return cEntityEffect::effInstantDamage; case 0x0d: return cEntityEffect::effWaterBreathing; case 0x0e: return cEntityEffect::effInvisibility; - + // No effect potions case 0x00: case 0x07: - case 0x0b: // Will be potion of leaping in 1.8 case 0x0f: { break; |