From f5a980be9b1facbe25c6f3000fa532c2ffaf188e Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Tue, 4 Oct 2016 17:51:37 +0200
Subject: [PATCH] Core/Units: Clear UNIT_NPC_EMOTESTATE on death (blizzlike)

Closes #15263
Closes #18027
---
 src/server/game/Entities/Unit/Unit.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 0acbcfa3031..8e0fee9ab48 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -11065,6 +11065,7 @@ void Unit::setDeathState(DeathState s)
         // do not why since in IncreaseMaxHealth currenthealth is checked
         SetHealth(0);
         SetPower(getPowerType(), 0);
+        SetUInt32Value(UNIT_NPC_EMOTESTATE, 0);
 
         // players in instance don't have ZoneScript, but they have InstanceScript
         if (ZoneScript* zoneScript = GetZoneScript() ? GetZoneScript() : GetInstanceScript())