diff options
| author | SnapperRy <snapperryen@gmail.com> | 2016-07-15 18:31:52 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-02-05 17:36:37 +0100 |
| commit | 90be9d143b6c7da1af89afb3a597add27d50b678 (patch) | |
| tree | 0f5f9c01069b76859fe5db1f742bd2a270db80d4 /src | |
| parent | dd9cff83287ce561d7f5cdb2c335f97e2cd185d3 (diff) | |
Core/Unit: remove emote state when creature attacks another unit (#17542)
(cherry picked from commit a732749d721eefe7558d23e44c5f8dc18194e6d4)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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 |