From 0dd172b80ffc949cf87119ad2003589d7eb82c46 Mon Sep 17 00:00:00 2001
From: Fabian <fenstein12@googlemail.com>
Date: Wed, 22 Nov 2017 14:47:52 +0100
Subject: Store Health as a float (#4073)

* Fix #4024

* Fix clang error

* Add comment

* Fix behaviour

* Save Health as float

* Changed m_Health to float

* Remove redundant static_cast

* Fix casts
---
 src/Entities/Minecart.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Entities/Minecart.cpp')

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index 7c5ca49ce..4de53d716 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -1035,7 +1035,7 @@ bool cMinecart::DoTakeDamage(TakeDamageInfo & TDI)
 	if ((TDI.Attacker != nullptr) && TDI.Attacker->IsPlayer() && static_cast<cPlayer *>(TDI.Attacker)->IsGameModeCreative())
 	{
 		Destroy();
-		TDI.FinalDamage = GetMaxHealth();  // Instant hit for creative
+		TDI.FinalDamage = static_cast<int>(GetMaxHealth());  // Instant hit for creative
 		SetInvulnerableTicks(0);
 		return super::DoTakeDamage(TDI);  // No drops for creative
 	}
-- 
cgit v1.2.3