From 3ad64fc170ddebe4342ce39feeb2eb3a61ebf4c9 Mon Sep 17 00:00:00 2001 From: Ovalord <1Don7H4v3@m41L.com> Date: Thu, 18 Jan 2018 13:51:04 +0100 Subject: [PATCH] Core/Units: merged the overkill packet fix --- src/server/game/Entities/Unit/Unit.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index a5f6c221087..fe78ebded5f 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -5159,8 +5159,10 @@ void Unit::SendAttackStateUpdate(CalcDamageInfo* damageInfo) data << damageInfo->attacker->GetPackGUID(); data << damageInfo->target->GetPackGUID(); data << uint32(damageInfo->damage); // Full damage - int32 overkill = damageInfo->damage - damageInfo->target->GetHealth(); - data << uint32(overkill < 0 ? 0 : overkill); // Overkill + if (damageInfo->damage > damageInfo->target->GetHealth()) + data << int32(damageInfo->damage - damageInfo->target->GetHealth()); + else + data << int32(-1); // Overkill data << uint8(count); // Sub damage count for (uint32 i = 0; i < count; ++i)