From e5582b344342d6e8c61448427086b07a72346dfe Mon Sep 17 00:00:00 2001
From: Raelorasz <82320853+Raelorasz@users.noreply.github.com>
Date: Tue, 11 May 2021 19:11:54 +0200
Subject: [PATCH] fix(Core/Creature): Fix kill credit for some mobs after
 UpdateEntry (#5746)

Co-authored-by: Yehonal <yehonal.azeroth@gmail.com
---
 src/server/game/Entities/Creature/Creature.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index d40716982..6673e5e5d 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -454,13 +454,22 @@ bool Creature::UpdateEntry(uint32 Entry, const CreatureData* data, bool changele
     SetAttackTime(RANGED_ATTACK, cInfo->RangeAttackTime);
 
     uint32 previousHealth = GetHealth();
+    uint32 previousMaxHealth = GetMaxHealth();
     uint32 previousPlayerDamageReq = m_PlayerDamageReq;
 
     SelectLevel(changelevel);
     if (previousHealth > 0)
     {
         SetHealth(previousHealth);
-        m_PlayerDamageReq = previousPlayerDamageReq;
+
+        if (previousMaxHealth && previousMaxHealth > GetMaxHealth())
+        {
+            m_PlayerDamageReq = (uint32)(previousPlayerDamageReq * GetMaxHealth() / previousMaxHealth);
+        }
+        else
+        {
+            m_PlayerDamageReq = previousPlayerDamageReq;
+        }
     }
 
     SetMeleeDamageSchool(SpellSchools(cInfo->dmgschool));