diff options
| author | Mattes D <github@xoft.cz> | 2020-05-06 09:24:39 +0200 |
|---|---|---|
| committer | peterbell10 <peterbell10@live.co.uk> | 2020-05-06 13:53:37 +0200 |
| commit | bdb8830b9cc1a2bb3251e7649f171809b5f28ad1 (patch) | |
| tree | 37ce1ebbb68462c3da7c0dd096738bcad798c31f /src/Entities | |
| parent | Update fmt to 6.2.0 (#4718) (diff) | |
| download | cuberite-bdb8830b9cc1a2bb3251e7649f171809b5f28ad1.tar cuberite-bdb8830b9cc1a2bb3251e7649f171809b5f28ad1.tar.gz cuberite-bdb8830b9cc1a2bb3251e7649f171809b5f28ad1.tar.bz2 cuberite-bdb8830b9cc1a2bb3251e7649f171809b5f28ad1.tar.lz cuberite-bdb8830b9cc1a2bb3251e7649f171809b5f28ad1.tar.xz cuberite-bdb8830b9cc1a2bb3251e7649f171809b5f28ad1.tar.zst cuberite-bdb8830b9cc1a2bb3251e7649f171809b5f28ad1.zip | |
Diffstat (limited to 'src/Entities')
| -rw-r--r-- | src/Entities/Entity.cpp | 2 | ||||
| -rw-r--r-- | src/Entities/Minecart.cpp | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index 8c2b6fea8..55df8b834 100644 --- a/src/Entities/Entity.cpp +++ b/src/Entities/Entity.cpp @@ -282,7 +282,7 @@ void cEntity::TakeDamage(cEntity & a_Attacker) void cEntity::TakeDamage(eDamageType a_DamageType, cEntity * a_Attacker, int a_RawDamage, double a_KnockbackAmount) { - float FinalDamage = a_RawDamage; + float FinalDamage = static_cast<float>(a_RawDamage); float ArmorCover = GetArmorCoverAgainst(a_Attacker, a_DamageType, a_RawDamage); ApplyArmorDamage(static_cast<int>(ArmorCover)); diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp index 2463200c7..59d369c5b 100644 --- a/src/Entities/Minecart.cpp +++ b/src/Entities/Minecart.cpp @@ -952,7 +952,6 @@ bool cMinecart::TestBlockCollision(NIBBLETYPE a_RailMeta) } break; - UNREACHABLE("Invalid minecart movement"); } case E_META_RAIL_CURVED_ZP_XM: { @@ -970,7 +969,6 @@ bool cMinecart::TestBlockCollision(NIBBLETYPE a_RailMeta) } break; - UNREACHABLE("Invalid minecart movement"); } case E_META_RAIL_CURVED_ZM_XM: { @@ -988,7 +986,6 @@ bool cMinecart::TestBlockCollision(NIBBLETYPE a_RailMeta) } break; - UNREACHABLE("Invalid minecart movement"); } case E_META_RAIL_CURVED_ZM_XP: { @@ -1006,7 +1003,6 @@ bool cMinecart::TestBlockCollision(NIBBLETYPE a_RailMeta) } break; - UNREACHABLE("Invalid minecart movement"); } } |