From c77925da4a320df5be5eaeb1fc799df50e22c041 Mon Sep 17 00:00:00 2001 From: ariel- Date: Mon, 22 Jan 2018 15:00:55 -0300 Subject: Core/Entities: killed Creature::SetInCombatWithZone and replaced with AI version Closes #12108 (again) (cherry picked from commit 7c9722a4ae08b5f283f6a085a411e37604a7da9f) --- src/server/game/AI/SmartScripts/SmartScript.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/server/game/AI/SmartScripts') diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 68dfc5ed2e9..bd624166a5c 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -1005,7 +1005,9 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u { if (IsCreature(target)) { - target->ToCreature()->SetInCombatWithZone(); + Creature* creature = target->ToCreature(); + if (creature->IsAIEnabled) + creature->AI()->DoZoneInCombat(); TC_LOG_DEBUG("scripts.ai", "SmartScript::ProcessAction: SMART_ACTION_SET_IN_COMBAT_WITH_ZONE: Creature %s, target: %s", me->GetGUID().ToString().c_str(), target->GetGUID().ToString().c_str()); } } -- cgit v1.2.3