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
@@ -43,12 +43,7 @@ enum Creatures
struct boss_balinda : public ScriptedAI
{
boss_balinda(Creature* creature) : ScriptedAI(creature), summons(me), _hasCastIceBlock(false)
{
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
{ }
void Reset() override
{
@@ -45,12 +45,7 @@ enum Spells
struct boss_curator : public BossAI
{
boss_curator(Creature* creature) : BossAI(creature, DATA_CURATOR)
{
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
{ }
void Reset() override
{
@@ -39,12 +39,7 @@ enum Spells
struct boss_maiden_of_virtue : public BossAI
{
boss_maiden_of_virtue(Creature* creature) : BossAI(creature, DATA_MAIDEN)
{
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
{ }
void JustEngagedWith(Unit* who) override
{
@@ -75,10 +75,6 @@ struct boss_moroes : public BossAI
boss_moroes(Creature* creature) : BossAI(creature, DATA_MOROES)
{
_activeGuests = 0;
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void InitializeAI() override
@@ -74,12 +74,7 @@ enum Events
struct boss_tenris_mirkblood : public BossAI
{
boss_tenris_mirkblood(Creature* creature) : BossAI(creature, DATA_MIRKBLOOD)
{
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
{ }
void Reset() override
{
@@ -147,12 +147,7 @@ private:
struct boss_terestian_illhoof : public BossAI
{
boss_terestian_illhoof(Creature* creature) : BossAI(creature, DATA_TERESTIAN)
{
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
{ }
void Reset() override
{
@@ -87,12 +87,7 @@ public:
struct boss_apothecary_hummelAI : public BossAI
{
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
{
@@ -126,10 +126,6 @@ struct npc_kiljaeden_controller : public NullCreatureAI
npc_kiljaeden_controller(Creature* creature) : NullCreatureAI(creature), summons(me)
{
instance = creature->GetInstanceScript();
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void ResetOrbs()
@@ -233,11 +229,6 @@ struct boss_kiljaeden : public BossAI
boss_kiljaeden(Creature* creature) : BossAI(creature, DATA_KILJAEDEN)
{
me->SetReactState(REACT_PASSIVE);
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void InitializeAI() override
@@ -292,12 +292,7 @@ enum SunbladeArchMageSpells
struct npc_sunblade_arch_mage : public ScriptedAI
{
npc_sunblade_arch_mage(Creature* creature) : ScriptedAI(creature)
{
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
{ }
void Reset() override
{
@@ -86,12 +86,7 @@ enum Actions
struct boss_halazzi : public BossAI
{
boss_halazzi(Creature* creature) : BossAI(creature, DATA_HALAZZI)
{
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
{ }
void Reset() override
{
@@ -233,12 +233,7 @@ static PlayerAbilityStruct PlayerAbility[13][3] =
struct boss_hexlord_malacrass : public BossAI
{
boss_hexlord_malacrass(Creature* creature) : BossAI(creature, DATA_HEXLORD)
{
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
{ }
void Reset() override
{
@@ -120,12 +120,7 @@ enum Misc
struct boss_janalai : public BossAI
{
boss_janalai(Creature* creature) : BossAI(creature, DATA_JANALAI)
{
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
{ }
void Reset() override
{
@@ -115,11 +115,6 @@ struct boss_thekal : public BossAI
);
context.Repeat(5s, 25s);
});
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
}
void JustDied(Unit* /*killer*/) override
@@ -74,11 +74,6 @@ public:
void InitializeAI() override
{
scheduler.SetValidator([this]
{
return !me->HasUnitState(UNIT_STATE_CASTING);
});
Reset();
}