aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2016-10-04 17:51:37 +0200
committerSnapperRy <snapperryen@gmail.com>2016-10-04 20:32:51 +0200
commit256d07f26f682a436f1c96f277309e1c76a2316a (patch)
tree3f429dbaca6299c1c5dc99d7a7523d297f1ee99f /src
parentb60db6c44ec892c8d5efcf844afeb8bb57208e1b (diff)
Core/Units: Clear UNIT_NPC_EMOTESTATE on death (blizzlike)
Closes #15263 Closes #18027 (cherry picked from commit cd326db30ff1d781d31dd9ceb688640e7e9266fc)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp1
1 files changed, 1 insertions, 0 deletions
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())