Merge pull request #10 from jprzimba/fix-damage

* Fixed sending damage higher then monster health
jprzimba · Dec 30, 2024 · 2e3c23a · 2e3c23a
2 parents f602f6c + e06a056
commit 2e3c23a
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/game/game.cpp b/src/game/game.cpp
@@ -7496,6 +7496,13 @@ bool Game::combatChangeHealth(const std::shared_ptr<Creature> &attacker, const s
 
 		addCreatureHealth(spectators.data(), target);
 
+		int32_t adjustedDamage = realDamage;
+		if (target) {
+			if (realDamage > targetHealth) {
+				adjustedDamage = targetHealth > 0 ? targetHealth : realDamage;
+			}
+		}
+
 		sendDamageMessageAndEffects(
 			attacker,
 			target,
@@ -7505,7 +7512,7 @@ bool Game::combatChangeHealth(const std::shared_ptr<Creature> &attacker, const s
 			targetPlayer,
 			message,
 			spectators.data(),
-			realDamage
+			adjustedDamage // realDamage
 		);
 
 		if (attackerPlayer) {