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

Closes #15263
Closes #18027

(cherry picked from commit cd326db30ff1d781d31dd9ceb688640e7e9266fc)
---
 src/server/game/Entities/Unit/Unit.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index af58326b1b4..b2308313eab 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -12154,6 +12154,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())
-- 
cgit v1.2.3