From 90be9d143b6c7da1af89afb3a597add27d50b678 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) (cherry picked from commit a732749d721eefe7558d23e44c5f8dc18194e6d4) --- 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 77c2f7dbca6..5756aa5d921 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -6810,6 +6810,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