From a732749d721eefe7558d23e44c5f8dc18194e6d4 Mon Sep 17 00:00:00 2001 From: SnapperRy Date: Fri, 15 Jul 2016 18:31:52 +0200 Subject: Core/Unit: remove emote state when creature attacks another unit (#17542) --- src/server/game/Entities/Unit/Unit.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 87a2da9743f..a78be0e3301 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -8584,6 +8584,9 @@ bool Unit::Attack(Unit* victim, bool meleeAttack) ToCreature()->SendAIReaction(AI_REACTION_HOSTILE); ToCreature()->CallAssistance(); + + // Remove emote state - will be restored on creature reset + SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); } // delay offhand weapon attack to next attack time -- cgit v1.2.3