aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Northrend
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2018-08-22 21:51:16 +0200
committerShauren <shauren.trinity@gmail.com>2021-10-22 13:29:34 +0200
commit5d48e8db7d0175af807e77214583058bf6e9c790 (patch)
tree1cf8f1331d538ab90799c115fd6773cefee794ab /src/server/scripts/Northrend
parent8f097e4425d182c03b26d847c0537207d9f3cd2e (diff)
Core/AI: Remove unnecessary parameter from DoZoneInCombat after eb1972f
(cherry picked from commit c00a2efb21356eb4105cb7db9112c708762d9191)
Diffstat (limited to 'src/server/scripts/Northrend')
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.cpp2
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp4
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp2
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp2
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_noth.cpp2
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp4
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp2
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp2
-rw-r--r--src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp12
9 files changed, 16 insertions, 16 deletions
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.cpp
index eb7b02364b8..680b1e0d1c4 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.cpp
@@ -40,7 +40,7 @@ void boss_horAI::DoAction(int32 actionId)
case ACTION_ENTER_COMBAT: // called by InstanceScript when boss shall enter in combat.
me->SetImmuneToAll(false);
me->SetReactState(REACT_AGGRESSIVE);
- DoZoneInCombat(me, 150.0f);
+ DoZoneInCombat(me);
break;
default:
break;
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
index c2bea8f0443..5807db4350d 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
@@ -1657,7 +1657,7 @@ class npc_phantom_hallucination : public CreatureScript
void Reset() override
{
- DoZoneInCombat(me, 150.0f);
+ DoZoneInCombat(me);
}
void EnterEvadeMode(EvadeReason why) override
@@ -2182,7 +2182,7 @@ struct npc_escape_event_trash : public ScriptedAI
void IsSummonedBy(Unit* /*summoner*/) override
{
- DoZoneInCombat(me, 0.0f);
+ DoZoneInCombat(me);
if (Creature* leader = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_ESCAPE_LEADER)))
{
me->SetImmuneToPC(false);
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
index 43528f658e7..a3f29ffaafd 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
@@ -596,7 +596,7 @@ class instance_halls_of_reflection : public InstanceMapScript
temp->CastSpell(temp, SPELL_SPIRIT_ACTIVATE, false);
temp->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
temp->SetImmuneToAll(false);
- temp->AI()->DoZoneInCombat(temp, 100.00f);
+ temp->AI()->DoZoneInCombat(temp);
}
}
}
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
index 31da40234b9..6a7cfb08a04 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
@@ -218,7 +218,7 @@ class npc_faerlina_add : public CreatureScript
void JustEngagedWith(Unit* /*who*/) override
{
if (Creature* faerlina = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_FAERLINA)))
- faerlina->AI()->DoZoneInCombat(nullptr, 250.0f);
+ faerlina->AI()->DoZoneInCombat();
}
void JustDied(Unit* /*killer*/) override
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
index dd3abb1ece9..d29e0c71d5a 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
@@ -166,7 +166,7 @@ public:
summons.Summon(summon);
summon->setActive(true);
summon->SetFarVisible(true);
- summon->AI()->DoZoneInCombat(nullptr, 250.0f); // specify range to cover entire room - default 50yd is not enough
+ summon->AI()->DoZoneInCombat();
}
void JustDied(Unit* /*killer*/) override
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
index ee568e5a307..028bd2d4974 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
@@ -189,7 +189,7 @@ class npc_dk_understudy : public CreatureScript
{
me->SetEmoteState(EMOTE_ONESHOT_NONE);
if (Creature* razuvious = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_RAZUVIOUS)))
- razuvious->AI()->DoZoneInCombat(nullptr, 250.0f);
+ razuvious->AI()->DoZoneInCombat();
}
void JustReachedHome() override
@@ -232,7 +232,7 @@ class npc_dk_understudy : public CreatureScript
me->SetReactState(REACT_AGGRESSIVE);
if (Unit* charmer = ObjectAccessor::GetUnit(*me, _charmer))
AddThreat(charmer, 100000.0f);
- DoZoneInCombat(nullptr, 250.0f);
+ DoZoneInCombat();
}
}
private:
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
index 01c7f92d576..4840c76c405 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
@@ -1591,7 +1591,7 @@ class npc_sif : public CreatureScript
if (action == ACTION_START_HARD_MODE)
{
me->SetReactState(REACT_AGGRESSIVE);
- DoZoneInCombat(me, 250.0f);
+ DoZoneInCombat(me);
Talk(SAY_SIF_EVENT);
_events.Reset();
_events.ScheduleEvent(EVENT_FROSTBOLT, 2000);
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
index aa5a2470826..657473b21c8 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp
@@ -104,7 +104,7 @@ struct generic_boss_controllerAI : public BossAI
if (IsInGhostForm)
{
// Call this here since ghosts aren't set in combat as they spawn.
- DoZoneInCombat(me, 50.0f);
+ DoZoneInCombat(me);
}
else
_Reset();
diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index 3abd0a6703d..b321c3ebfec 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -561,7 +561,7 @@ class instance_violet_hold : public InstanceMapScript
if (Creature* moragg = GetCreature(DATA_MORAGG))
{
moragg->SetImmuneToAll(false);
- moragg->AI()->DoZoneInCombat(moragg, 200.0f);
+ moragg->AI()->DoZoneInCombat(moragg);
}
});
});
@@ -599,7 +599,7 @@ class instance_violet_hold : public InstanceMapScript
if (Creature* erekem = GetCreature(DATA_EREKEM))
{
erekem->SetImmuneToAll(false);
- erekem->AI()->DoZoneInCombat(erekem, 200.0f);
+ erekem->AI()->DoZoneInCombat(erekem);
}
});
});
@@ -622,7 +622,7 @@ class instance_violet_hold : public InstanceMapScript
if (Creature* ichoron = GetCreature(DATA_ICHORON))
{
ichoron->SetImmuneToAll(false);
- ichoron->AI()->DoZoneInCombat(ichoron, 200.0f);
+ ichoron->AI()->DoZoneInCombat(ichoron);
}
});
});
@@ -644,7 +644,7 @@ class instance_violet_hold : public InstanceMapScript
if (Creature* lavanthor = GetCreature(DATA_LAVANTHOR))
{
lavanthor->SetImmuneToAll(false);
- lavanthor->AI()->DoZoneInCombat(lavanthor, 200.0f);
+ lavanthor->AI()->DoZoneInCombat(lavanthor);
}
});
});
@@ -671,7 +671,7 @@ class instance_violet_hold : public InstanceMapScript
if (Creature* xevozz = GetCreature(DATA_XEVOZZ))
{
xevozz->SetImmuneToAll(false);
- xevozz->AI()->DoZoneInCombat(xevozz, 200.0f);
+ xevozz->AI()->DoZoneInCombat(xevozz);
}
});
});
@@ -697,7 +697,7 @@ class instance_violet_hold : public InstanceMapScript
if (Creature* zuramat = GetCreature(DATA_ZURAMAT))
{
zuramat->SetImmuneToAll(false);
- zuramat->AI()->DoZoneInCombat(zuramat, 200.0f);
+ zuramat->AI()->DoZoneInCombat(zuramat);
}
});
});