From 466d986e5e7a01679e70a7affd5beaba401ae305 Mon Sep 17 00:00:00 2001 From: Aplaus228 <33102433+Aplaus228@users.noreply.github.com> Date: Thu, 8 Aug 2019 13:51:38 +0300 Subject: Change TakeDamageInfo::FinalDamage from int to float (#4359) Closes #4357 --- src/Entities/Minecart.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Entities/Minecart.cpp') diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp index 1c1cc484e..83fbe56de 100644 --- a/src/Entities/Minecart.cpp +++ b/src/Entities/Minecart.cpp @@ -1039,12 +1039,12 @@ bool cMinecart::DoTakeDamage(TakeDamageInfo & TDI) if ((TDI.Attacker != nullptr) && TDI.Attacker->IsPlayer() && static_cast(TDI.Attacker)->IsGameModeCreative()) { Destroy(); - TDI.FinalDamage = static_cast(GetMaxHealth()); // Instant hit for creative + TDI.FinalDamage = GetMaxHealth(); // Instant hit for creative SetInvulnerableTicks(0); return super::DoTakeDamage(TDI); // No drops for creative } - m_LastDamage = TDI.FinalDamage; + m_LastDamage = static_cast(TDI.FinalDamage); if (!super::DoTakeDamage(TDI)) { return false; -- cgit v1.2.3