nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-16 02:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Unit): Prevent Unit emote when entering combat (#6030)

Browse Source
This commit is contained in:
v.tihomirov
2021-05-31 10:59:25 +03:00
committed by GitHub
parent a21a6aa486
commit 793b915907
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -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())