aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Kalimdor
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2018-01-22 15:00:55 -0300
committerShauren <shauren.trinity@gmail.com>2021-06-16 21:03:06 +0200
commitc77925da4a320df5be5eaeb1fc799df50e22c041 (patch)
tree3a574f41483c6c73b6bd10aa254d15bbc2a4501c /src/server/scripts/Kalimdor
parent29bfa32fc39de1d93fbdb272d48689174c547725 (diff)
Core/Entities: killed Creature::SetInCombatWithZone and replaced with AI version
Closes #12108 (again) (cherry picked from commit 7c9722a4ae08b5f283f6a085a411e37604a7da9f)
Diffstat (limited to 'src/server/scripts/Kalimdor')
-rw-r--r--src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp2
-rw-r--r--src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
index 3da118111cf..7f9ce6a57fa 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
@@ -173,7 +173,7 @@ public:
void JustSummoned(Creature* summoned) override
{
- summoned->SetInCombatWithZone();
+ DoZoneInCombat(summoned);
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
summoned->AI()->AttackStart(target);
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
index fe964806ba2..5bc3384cb3c 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
@@ -89,7 +89,7 @@ public:
Position goPos = go->GetPosition();
if (Creature* temp = go->SummonCreature(NPC_WHELP, goPos, TEMPSUMMON_CORPSE_DESPAWN))
{
- temp->SetInCombatWithZone();
+ temp->AI()->DoZoneInCombat();
++manyWhelpsCounter;
}
break;