From 793b915907a1ce74fca621d980675a01a1bfb149 Mon Sep 17 00:00:00 2001 From: "v.tihomirov" Date: Mon, 31 May 2021 10:59:25 +0300 Subject: [PATCH] fix(Core/Unit): Prevent Unit emote when entering combat (#6030) --- src/server/game/Entities/Unit/Unit.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 088f8385b..e9e201b6b 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12922,6 +12922,7 @@ void Unit::CombatStart(Unit* target, bool initialAggro) SetInCombatWith(target); target->SetInCombatWith(this); + target->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); // Xinef: If pet started combat - put owner in combat if (Unit* owner = GetOwner())