From 7b714a703354f1c3036ea52e4e3f5957f1713f7e Mon Sep 17 00:00:00 2001 From: Killyana Date: Sat, 22 Jul 2017 09:09:16 +0200 Subject: [PATCH] Core/Npc: Remove bytes1 once the npc start a combat Closes #16832 By Rushor --- src/server/game/Entities/Unit/Unit.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 2126355ac6..6925764dd1 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -5541,8 +5541,9 @@ bool Unit::Attack(Unit* victim, bool meleeAttack) creature->SendAIReaction(AI_REACTION_HOSTILE); creature->CallAssistance(); - // Remove emote state - will be restored on creature reset + // Remove emote state and bytes - will be restored on creature reset SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); + SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_STAND); } // delay offhand weapon attack to next attack time