refactor(Core/Scripts): remove redundant scheduler SetValidator calls (#25189)

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Andrew
2026-03-22 18:53:26 -03:00
committed by GitHub
parent f1a027c250
commit 06ca4de210
60 changed files with 42 additions and 343 deletions

View File

@@ -43,12 +43,7 @@ enum Creatures
struct boss_balinda : public ScriptedAI struct boss_balinda : public ScriptedAI
{ {
boss_balinda(Creature* creature) : ScriptedAI(creature), summons(me), _hasCastIceBlock(false) boss_balinda(Creature* creature) : ScriptedAI(creature), summons(me), _hasCastIceBlock(false)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -45,12 +45,7 @@ enum Spells
struct boss_curator : public BossAI struct boss_curator : public BossAI
{ {
boss_curator(Creature* creature) : BossAI(creature, DATA_CURATOR) boss_curator(Creature* creature) : BossAI(creature, DATA_CURATOR)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -39,12 +39,7 @@ enum Spells
struct boss_maiden_of_virtue : public BossAI struct boss_maiden_of_virtue : public BossAI
{ {
boss_maiden_of_virtue(Creature* creature) : BossAI(creature, DATA_MAIDEN) boss_maiden_of_virtue(Creature* creature) : BossAI(creature, DATA_MAIDEN)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void JustEngagedWith(Unit* who) override void JustEngagedWith(Unit* who) override
{ {

View File

@@ -75,10 +75,6 @@ struct boss_moroes : public BossAI
boss_moroes(Creature* creature) : BossAI(creature, DATA_MOROES) boss_moroes(Creature* creature) : BossAI(creature, DATA_MOROES)
{ {
_activeGuests = 0; _activeGuests = 0;
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
} }
void InitializeAI() override void InitializeAI() override

View File

@@ -74,12 +74,7 @@ enum Events
struct boss_tenris_mirkblood : public BossAI struct boss_tenris_mirkblood : public BossAI
{ {
boss_tenris_mirkblood(Creature* creature) : BossAI(creature, DATA_MIRKBLOOD) boss_tenris_mirkblood(Creature* creature) : BossAI(creature, DATA_MIRKBLOOD)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -147,12 +147,7 @@ private:
struct boss_terestian_illhoof : public BossAI struct boss_terestian_illhoof : public BossAI
{ {
boss_terestian_illhoof(Creature* creature) : BossAI(creature, DATA_TERESTIAN) boss_terestian_illhoof(Creature* creature) : BossAI(creature, DATA_TERESTIAN)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -87,12 +87,7 @@ public:
struct boss_apothecary_hummelAI : public BossAI struct boss_apothecary_hummelAI : public BossAI
{ {
boss_apothecary_hummelAI(Creature* creature) : BossAI(creature, DATA_APOTHECARY_HUMMEL), _deadCount(0), _isDead(false) boss_apothecary_hummelAI(Creature* creature) : BossAI(creature, DATA_APOTHECARY_HUMMEL), _deadCount(0), _isDead(false)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void sGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override void sGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
{ {

View File

@@ -126,10 +126,6 @@ struct npc_kiljaeden_controller : public NullCreatureAI
npc_kiljaeden_controller(Creature* creature) : NullCreatureAI(creature), summons(me) npc_kiljaeden_controller(Creature* creature) : NullCreatureAI(creature), summons(me)
{ {
instance = creature->GetInstanceScript(); instance = creature->GetInstanceScript();
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
} }
void ResetOrbs() void ResetOrbs()
@@ -233,11 +229,6 @@ struct boss_kiljaeden : public BossAI
boss_kiljaeden(Creature* creature) : BossAI(creature, DATA_KILJAEDEN) boss_kiljaeden(Creature* creature) : BossAI(creature, DATA_KILJAEDEN)
{ {
me->SetReactState(REACT_PASSIVE); me->SetReactState(REACT_PASSIVE);
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
} }
void InitializeAI() override void InitializeAI() override

View File

@@ -292,12 +292,7 @@ enum SunbladeArchMageSpells
struct npc_sunblade_arch_mage : public ScriptedAI struct npc_sunblade_arch_mage : public ScriptedAI
{ {
npc_sunblade_arch_mage(Creature* creature) : ScriptedAI(creature) npc_sunblade_arch_mage(Creature* creature) : ScriptedAI(creature)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -86,12 +86,7 @@ enum Actions
struct boss_halazzi : public BossAI struct boss_halazzi : public BossAI
{ {
boss_halazzi(Creature* creature) : BossAI(creature, DATA_HALAZZI) boss_halazzi(Creature* creature) : BossAI(creature, DATA_HALAZZI)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -233,12 +233,7 @@ static PlayerAbilityStruct PlayerAbility[13][3] =
struct boss_hexlord_malacrass : public BossAI struct boss_hexlord_malacrass : public BossAI
{ {
boss_hexlord_malacrass(Creature* creature) : BossAI(creature, DATA_HEXLORD) boss_hexlord_malacrass(Creature* creature) : BossAI(creature, DATA_HEXLORD)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -120,12 +120,7 @@ enum Misc
struct boss_janalai : public BossAI struct boss_janalai : public BossAI
{ {
boss_janalai(Creature* creature) : BossAI(creature, DATA_JANALAI) boss_janalai(Creature* creature) : BossAI(creature, DATA_JANALAI)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -115,11 +115,6 @@ struct boss_thekal : public BossAI
); );
context.Repeat(5s, 25s); context.Repeat(5s, 25s);
}); });
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
} }
void JustDied(Unit* /*killer*/) override void JustDied(Unit* /*killer*/) override

View File

@@ -74,11 +74,6 @@ public:
void InitializeAI() override void InitializeAI() override
{ {
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
Reset(); Reset();
} }

View File

@@ -50,10 +50,6 @@ public:
boss_anetheron(Creature* creature) : BossAI(creature, DATA_ANETHERON) boss_anetheron(Creature* creature) : BossAI(creature, DATA_ANETHERON)
{ {
_recentlySpoken = false; _recentlySpoken = false;
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
} }
void JustEngagedWith(Unit * who) override void JustEngagedWith(Unit * who) override

View File

@@ -186,10 +186,6 @@ struct boss_archimonde : public BossAI
{ {
boss_archimonde(Creature* creature) : BossAI(creature, DATA_ARCHIMONDE) boss_archimonde(Creature* creature) : BossAI(creature, DATA_ARCHIMONDE)
{ {
scheduler.SetValidator([&]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
} }
void Reset() override void Reset() override

View File

@@ -47,10 +47,6 @@ public:
boss_azgalor(Creature* creature) : BossAI(creature, DATA_AZGALOR) boss_azgalor(Creature* creature) : BossAI(creature, DATA_AZGALOR)
{ {
_recentlySpoken = false; _recentlySpoken = false;
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
} }
void JustEngagedWith(Unit * who) override void JustEngagedWith(Unit * who) override

View File

@@ -48,12 +48,7 @@ struct boss_kazrogal : public BossAI
{ {
public: public:
boss_kazrogal(Creature* creature) : BossAI(creature, DATA_KAZROGAL) boss_kazrogal(Creature* creature) : BossAI(creature, DATA_KAZROGAL)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -50,10 +50,6 @@ public:
boss_rage_winterchill(Creature* creature) : BossAI(creature, DATA_WINTERCHILL) boss_rage_winterchill(Creature* creature) : BossAI(creature, DATA_WINTERCHILL)
{ {
_recentlySpoken = false; _recentlySpoken = false;
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
} }
void JustEngagedWith(Unit* who) override void JustEngagedWith(Unit* who) override

View File

@@ -352,12 +352,7 @@ class spell_cannibalize_heal : public SpellScript
struct npc_hyjal_ground_trash : public ScriptedAI struct npc_hyjal_ground_trash : public ScriptedAI
{ {
npc_hyjal_ground_trash(Creature* creature) : ScriptedAI(creature) npc_hyjal_ground_trash(Creature* creature) : ScriptedAI(creature)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {
@@ -574,12 +569,7 @@ struct npc_hyjal_ground_trash : public ScriptedAI
struct npc_hyjal_gargoyle : public ScriptedAI struct npc_hyjal_gargoyle : public ScriptedAI
{ {
npc_hyjal_gargoyle(Creature* creature) : ScriptedAI(creature) npc_hyjal_gargoyle(Creature* creature) : ScriptedAI(creature)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {
@@ -648,12 +638,7 @@ struct npc_hyjal_gargoyle : public ScriptedAI
struct npc_hyjal_frost_wyrm : public ScriptedAI struct npc_hyjal_frost_wyrm : public ScriptedAI
{ {
npc_hyjal_frost_wyrm(Creature* creature) : ScriptedAI(creature) npc_hyjal_frost_wyrm(Creature* creature) : ScriptedAI(creature)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -53,12 +53,7 @@ const Position startPath[WAYPOINTS_COUNT] =
struct boss_captain_skarloc : public BossAI struct boss_captain_skarloc : public BossAI
{ {
boss_captain_skarloc(Creature* creature) : BossAI(creature, DATA_CAPTAIN_SKARLOC), summons(me) boss_captain_skarloc(Creature* creature) : BossAI(creature, DATA_CAPTAIN_SKARLOC), summons(me)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
SummonList summons; SummonList summons;
bool _spawnedAdds; bool _spawnedAdds;

View File

@@ -53,12 +53,7 @@ public:
struct boss_azuregosAI : public ScriptedAI struct boss_azuregosAI : public ScriptedAI
{ {
boss_azuregosAI(Creature* creature) : ScriptedAI(creature) boss_azuregosAI(Creature* creature) : ScriptedAI(creature)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -60,11 +60,6 @@ public:
_initTalk = false; _initTalk = false;
_canTalk = true; _canTalk = true;
_minionInCombat = false; _minionInCombat = false;
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
} }
void Reset() override void Reset() override

View File

@@ -172,12 +172,7 @@ private:
struct boss_taldaram : public BossAI struct boss_taldaram : public BossAI
{ {
boss_taldaram(Creature* pCreature) : BossAI(pCreature, DATA_PRINCE_TALDARAM), vanishDamage(0) boss_taldaram(Creature* pCreature) : BossAI(pCreature, DATA_PRINCE_TALDARAM), vanishDamage(0)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void InitializeAI() override void InitializeAI() override
{ {

View File

@@ -43,12 +43,7 @@ Position const EckCombatStartPosition = { 1638.55f, 919.76f, 104.95f, 0.00f };
struct boss_eck : public BossAI struct boss_eck : public BossAI
{ {
boss_eck(Creature* creature) : BossAI(creature, DATA_ECK_THE_FEROCIOUS) boss_eck(Creature* creature) : BossAI(creature, DATA_ECK_THE_FEROCIOUS)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void InitializeAI() override void InitializeAI() override
{ {

View File

@@ -61,10 +61,6 @@ struct boss_exarch_maladaar : public BossAI
boss_exarch_maladaar(Creature* creature) : BossAI(creature, DATA_EXARCH_MALADAAR) boss_exarch_maladaar(Creature* creature) : BossAI(creature, DATA_EXARCH_MALADAAR)
{ {
_talked = false; _talked = false;
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
} }
void Reset() override void Reset() override

View File

@@ -46,12 +46,7 @@ enum Misc
struct boss_shirrak_the_dead_watcher : public BossAI struct boss_shirrak_the_dead_watcher : public BossAI
{ {
boss_shirrak_the_dead_watcher(Creature* creature) : BossAI(creature, DATA_SHIRRAK_THE_DEAD_WATCHER) boss_shirrak_the_dead_watcher(Creature* creature) : BossAI(creature, DATA_SHIRRAK_THE_DEAD_WATCHER)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
ObjectGuid focusGUID; ObjectGuid focusGUID;

View File

@@ -54,10 +54,6 @@ struct boss_nexusprince_shaffar : public BossAI
boss_nexusprince_shaffar(Creature* creature) : BossAI(creature, DATA_NEXUSPRINCE_SHAFFAR), summons(me) boss_nexusprince_shaffar(Creature* creature) : BossAI(creature, DATA_NEXUSPRINCE_SHAFFAR), summons(me)
{ {
HasTaunted = false; HasTaunted = false;
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
} }
SummonList summons; SummonList summons;

View File

@@ -55,12 +55,7 @@ constexpr uint8 MAX_VOID_BLAST = 5;
struct boss_pandemonius : public BossAI struct boss_pandemonius : public BossAI
{ {
boss_pandemonius(Creature* creature) : BossAI(creature, DATA_PANDEMONIUS) boss_pandemonius(Creature* creature) : BossAI(creature, DATA_PANDEMONIUS)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void JustEngagedWith(Unit* who) override void JustEngagedWith(Unit* who) override
{ {

View File

@@ -29,12 +29,7 @@ enum Spells
struct boss_tavarok : public BossAI struct boss_tavarok : public BossAI
{ {
boss_tavarok(Creature* creature) : BossAI(creature, DATA_TAVAROK) boss_tavarok(Creature* creature) : BossAI(creature, DATA_TAVAROK)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -68,10 +68,6 @@ struct boss_anzu : public BossAI
talkTimer = 1; talkTimer = 1;
me->ReplaceAllUnitFlags(UNIT_FLAG_NON_ATTACKABLE); me->ReplaceAllUnitFlags(UNIT_FLAG_NON_ATTACKABLE);
me->AddAura(SPELL_SHADOWFORM, me); me->AddAura(SPELL_SHADOWFORM, me);
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
} }
const Position AnzuSpiritPos[3] = const Position AnzuSpiritPos[3] =

View File

@@ -43,12 +43,7 @@ enum Spells
struct boss_darkweaver_syth : public BossAI struct boss_darkweaver_syth : public BossAI
{ {
boss_darkweaver_syth(Creature* creature) : BossAI(creature, DATA_DARKWEAVER_SYTH) boss_darkweaver_syth(Creature* creature) : BossAI(creature, DATA_DARKWEAVER_SYTH)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -46,12 +46,7 @@ enum Spells
struct boss_talon_king_ikiss : public BossAI struct boss_talon_king_ikiss : public BossAI
{ {
boss_talon_king_ikiss(Creature* creature) : BossAI(creature, DATA_IKISS), _spoken(false) boss_talon_king_ikiss(Creature* creature) : BossAI(creature, DATA_IKISS), _spoken(false)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -45,12 +45,7 @@ enum Npc
struct boss_blackheart_the_inciter : public BossAI struct boss_blackheart_the_inciter : public BossAI
{ {
boss_blackheart_the_inciter(Creature* creature) : BossAI(creature, DATA_BLACKHEARTTHEINCITEREVENT) boss_blackheart_the_inciter(Creature* creature) : BossAI(creature, DATA_BLACKHEARTTHEINCITEREVENT)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
bool InciteChaos; bool InciteChaos;

View File

@@ -59,10 +59,6 @@ struct boss_murmur : public BossAI
boss_murmur(Creature* creature) : BossAI(creature, DATA_MURMUR) boss_murmur(Creature* creature) : BossAI(creature, DATA_MURMUR)
{ {
me->SetCombatMovement(false); me->SetCombatMovement(false);
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
} }
void Reset() override void Reset() override

View File

@@ -48,12 +48,7 @@ enum Supremus
struct boss_supremus : public BossAI struct boss_supremus : public BossAI
{ {
boss_supremus(Creature* creature) : BossAI(creature, DATA_SUPREMUS) boss_supremus(Creature* creature) : BossAI(creature, DATA_SUPREMUS)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -205,11 +205,6 @@ struct boss_fathomguard_sharkkis : public ScriptedAI
{ {
_instance = creature->GetInstanceScript(); _instance = creature->GetInstanceScript();
SetBoundary(_instance->GetBossBoundary(DATA_FATHOM_LORD_KARATHRESS)); SetBoundary(_instance->GetBossBoundary(DATA_FATHOM_LORD_KARATHRESS));
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
} }
void Reset() override void Reset() override

View File

@@ -72,11 +72,6 @@ struct boss_lady_vashj : public BossAI
{ {
boss_lady_vashj(Creature* creature) : BossAI(creature, DATA_LADY_VASHJ) boss_lady_vashj(Creature* creature) : BossAI(creature, DATA_LADY_VASHJ)
{ {
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
_intro = false; _intro = false;
} }

View File

@@ -249,12 +249,7 @@ private:
struct npc_inner_demon : public ScriptedAI struct npc_inner_demon : public ScriptedAI
{ {
npc_inner_demon(Creature* creature) : ScriptedAI(creature) npc_inner_demon(Creature* creature) : ScriptedAI(creature)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void IsSummonedBy(WorldObject* summoner) override void IsSummonedBy(WorldObject* summoner) override
{ {

View File

@@ -55,12 +55,7 @@ const uint32 waterGlobuleIds[4] = {SPELL_SUMMON_WATER_GLOBULE_1, SPELL_SUMMON_WA
struct boss_morogrim_tidewalker : public BossAI struct boss_morogrim_tidewalker : public BossAI
{ {
boss_morogrim_tidewalker(Creature* creature) : BossAI(creature, DATA_MOROGRIM_TIDEWALKER) boss_morogrim_tidewalker(Creature* creature) : BossAI(creature, DATA_MOROGRIM_TIDEWALKER)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -38,12 +38,7 @@ enum Text
struct boss_mennu_the_betrayer : public BossAI struct boss_mennu_the_betrayer : public BossAI
{ {
boss_mennu_the_betrayer(Creature* creature) : BossAI(creature, DATA_MENNU_THE_BETRAYER) boss_mennu_the_betrayer(Creature* creature) : BossAI(creature, DATA_MENNU_THE_BETRAYER)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -30,12 +30,7 @@ enum Spells
struct boss_quagmirran : public BossAI struct boss_quagmirran : public BossAI
{ {
boss_quagmirran(Creature* creature) : BossAI(creature, DATA_QUAGMIRRAN) boss_quagmirran(Creature* creature) : BossAI(creature, DATA_QUAGMIRRAN)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void JustEngagedWith(Unit* /*who*/) override void JustEngagedWith(Unit* /*who*/) override
{ {

View File

@@ -30,12 +30,7 @@ enum Spells
struct boss_rokmar_the_crackler : public BossAI struct boss_rokmar_the_crackler : public BossAI
{ {
explicit boss_rokmar_the_crackler(Creature* creature) : BossAI(creature, DATA_ROKMAR_THE_CRACKLER) explicit boss_rokmar_the_crackler(Creature* creature) : BossAI(creature, DATA_ROKMAR_THE_CRACKLER)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -41,12 +41,7 @@ enum MekgineerSteamrigger
struct boss_mekgineer_steamrigger : public BossAI struct boss_mekgineer_steamrigger : public BossAI
{ {
boss_mekgineer_steamrigger(Creature* creature) : BossAI(creature, DATA_MEKGINEER_STEAMRIGGER) boss_mekgineer_steamrigger(Creature* creature) : BossAI(creature, DATA_MEKGINEER_STEAMRIGGER)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void JustDied(Unit* /*killer*/) override void JustDied(Unit* /*killer*/) override
{ {

View File

@@ -35,12 +35,7 @@ enum eBlackStalker
struct boss_ghazan : public BossAI struct boss_ghazan : public BossAI
{ {
boss_ghazan(Creature* creature) : BossAI(creature, DATA_GHAZAN) boss_ghazan(Creature* creature) : BossAI(creature, DATA_GHAZAN)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void InitializeAI() override void InitializeAI() override
{ {

View File

@@ -47,12 +47,7 @@ enum Misc
struct boss_swamplord_muselek : public BossAI struct boss_swamplord_muselek : public BossAI
{ {
boss_swamplord_muselek(Creature* creature) : BossAI(creature, DATA_MUSELEK) boss_swamplord_muselek(Creature* creature) : BossAI(creature, DATA_MUSELEK)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -54,12 +54,7 @@ enum eBlackStalker
struct boss_the_black_stalker : public BossAI struct boss_the_black_stalker : public BossAI
{ {
boss_the_black_stalker(Creature* creature) : BossAI(creature, DATA_BLACK_STALKER) boss_the_black_stalker(Creature* creature) : BossAI(creature, DATA_BLACK_STALKER)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void JustEngagedWith(Unit* /*who*/) override void JustEngagedWith(Unit* /*who*/) override
{ {

View File

@@ -64,12 +64,7 @@ enum HighKingMaulgar
struct boss_high_king_maulgar : public BossAI struct boss_high_king_maulgar : public BossAI
{ {
boss_high_king_maulgar(Creature* creature) : BossAI(creature, DATA_MAULGAR) boss_high_king_maulgar(Creature* creature) : BossAI(creature, DATA_MAULGAR)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -53,12 +53,7 @@ enum Actions
struct boss_kelidan_the_breaker : public BossAI struct boss_kelidan_the_breaker : public BossAI
{ {
boss_kelidan_the_breaker(Creature* creature) : BossAI(creature, DATA_KELIDAN) boss_kelidan_the_breaker(Creature* creature) : BossAI(creature, DATA_KELIDAN)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -35,12 +35,7 @@ enum Spells
struct boss_the_maker : public BossAI struct boss_the_maker : public BossAI
{ {
boss_the_maker(Creature* creature) : BossAI(creature, DATA_THE_MAKER) boss_the_maker(Creature* creature) : BossAI(creature, DATA_THE_MAKER)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void JustEngagedWith(Unit* /*who*/) override void JustEngagedWith(Unit* /*who*/) override
{ {

View File

@@ -42,10 +42,6 @@ struct boss_omor_the_unscarred : public BossAI
boss_omor_the_unscarred(Creature* creature) : BossAI(creature, DATA_OMOR_THE_UNSCARRED) boss_omor_the_unscarred(Creature* creature) : BossAI(creature, DATA_OMOR_THE_UNSCARRED)
{ {
me->SetCombatMovement(false); me->SetCombatMovement(false);
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
} }
void Reset() override void Reset() override

View File

@@ -48,10 +48,6 @@ struct boss_watchkeeper_gargolmar : public BossAI
boss_watchkeeper_gargolmar(Creature* creature) : BossAI(creature, DATA_WATCHKEEPER_GARGOLMAR) boss_watchkeeper_gargolmar(Creature* creature) : BossAI(creature, DATA_WATCHKEEPER_GARGOLMAR)
{ {
_taunted = false; _taunted = false;
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
} }
void Reset() override void Reset() override

View File

@@ -79,12 +79,7 @@ enum Actions
struct boss_magtheridon : public BossAI struct boss_magtheridon : public BossAI
{ {
boss_magtheridon(Creature* creature) : BossAI(creature, DATA_MAGTHERIDON) boss_magtheridon(Creature* creature) : BossAI(creature, DATA_MAGTHERIDON)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -100,12 +100,7 @@ PeonRoleplay PeonRoleplayData[3] =
struct boss_grand_warlock_nethekurse : public BossAI struct boss_grand_warlock_nethekurse : public BossAI
{ {
boss_grand_warlock_nethekurse(Creature* creature) : BossAI(creature, DATA_NETHEKURSE) boss_grand_warlock_nethekurse(Creature* creature) : BossAI(creature, DATA_NETHEKURSE)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void Reset() override void Reset() override
{ {

View File

@@ -66,12 +66,7 @@ enum Phase
struct boss_warbringer_omrogg : public BossAI struct boss_warbringer_omrogg : public BossAI
{ {
boss_warbringer_omrogg(Creature* creature) : BossAI(creature, DATA_OMROGG) boss_warbringer_omrogg(Creature* creature) : BossAI(creature, DATA_OMROGG)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void HandleHeadTalk(HeadYells yell) void HandleHeadTalk(HeadYells yell)
{ {

View File

@@ -69,12 +69,7 @@ Position const kargathRespawnPos = { 231.25f, -83.6449f, 5.02341f };
struct boss_warchief_kargath_bladefist : public BossAI struct boss_warchief_kargath_bladefist : public BossAI
{ {
boss_warchief_kargath_bladefist(Creature* creature) : BossAI(creature, DATA_KARGATH) boss_warchief_kargath_bladefist(Creature* creature) : BossAI(creature, DATA_KARGATH)
{ { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void InitializeAI() override void InitializeAI() override
{ {

View File

@@ -98,10 +98,6 @@ struct boss_alar : public BossAI
boss_alar(Creature* creature) : BossAI(creature, DATA_ALAR) boss_alar(Creature* creature) : BossAI(creature, DATA_ALAR)
{ {
me->SetCombatMovement(false); me->SetCombatMovement(false);
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
} }
void Reset() override void Reset() override

View File

@@ -67,10 +67,6 @@ struct boss_high_astromancer_solarian : public BossAI
boss_high_astromancer_solarian(Creature* creature) : BossAI(creature, DATA_ASTROMANCER) boss_high_astromancer_solarian(Creature* creature) : BossAI(creature, DATA_ASTROMANCER)
{ {
callForHelpRange = 105.0f; callForHelpRange = 105.0f;
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
} }
void Reset() override void Reset() override

View File

@@ -725,12 +725,7 @@ private:
struct advisor_baseAI : public ScriptedAI struct advisor_baseAI : public ScriptedAI
{ {
advisor_baseAI(Creature* creature) : ScriptedAI(creature) { advisor_baseAI(Creature* creature) : ScriptedAI(creature) { }
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
virtual void ScheduleEvents() {} virtual void ScheduleEvents() {}

View File

@@ -42,11 +42,6 @@ struct boss_void_reaver : public BossAI
boss_void_reaver(Creature* creature) : BossAI(creature, DATA_REAVER) boss_void_reaver(Creature* creature) : BossAI(creature, DATA_REAVER)
{ {
callForHelpRange = 105.0f; callForHelpRange = 105.0f;
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
me->ApplySpellImmune(0, IMMUNITY_DISPEL, DISPEL_POISON, true); me->ApplySpellImmune(0, IMMUNITY_DISPEL, DISPEL_POISON, true);
me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_HEALTH_LEECH, true); me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_HEALTH_LEECH, true);
me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_POWER_DRAIN, true); me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_POWER_DRAIN, true);