mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-01-21 12:47:07 +00:00
refactor(Core): Make more use of helpers. (#19835)
* Init. * Reword. * Update codestyle script. Co-Authored-By: Kitzunu <24550914+Kitzunu@users.noreply.github.com> * Add gameobject type ID check, reorder checks. * Add helper/codestyle check for unit type. * `IsUnit()` -> `IsCreature()` * Add `IsUnit()` method. * Use type mask. https: //github.com/TrinityCore/TrinityCore/commit/cc71da35b5dc74abf71f8691161525a23d870bb5 Co-Authored-By: Giacomo Pozzoni <giacomopoz@gmail.com> Co-Authored-By: Ovahlord <18347559+Ovahlord@users.noreply.github.com> * Replace instances of `isType` with `IsUnit`. --------- Co-authored-by: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com> Co-authored-by: Ovahlord <18347559+Ovahlord@users.noreply.github.com>
This commit is contained in:
@@ -1584,7 +1584,7 @@ struct npc_coren_direbrew : public ScriptedAI
|
||||
|
||||
void MoveInLineOfSight(Unit* who) override
|
||||
{
|
||||
if (!_events.IsInPhase(PHASE_ALL) || who->GetTypeId() != TYPEID_PLAYER)
|
||||
if (!_events.IsInPhase(PHASE_ALL) || !who->IsPlayer())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -332,7 +332,7 @@ struct npc_midsummer_bonfire : public ScriptedAI
|
||||
|
||||
void SpellHit(Unit* caster, SpellInfo const* spellInfo) override
|
||||
{
|
||||
if (caster->GetTypeId() != TYPEID_PLAYER)
|
||||
if (!caster->IsPlayer())
|
||||
return;
|
||||
|
||||
switch (spellInfo->Id)
|
||||
@@ -1172,7 +1172,7 @@ class spell_midsummer_juggling_torch : public SpellScript
|
||||
void HandleFinish()
|
||||
{
|
||||
Unit* caster = GetCaster();
|
||||
if (!caster || caster->GetTypeId() != TYPEID_PLAYER)
|
||||
if (!caster || !caster->IsPlayer())
|
||||
return;
|
||||
|
||||
if (const WorldLocation* loc = GetExplTargetDest())
|
||||
|
||||
@@ -571,7 +571,7 @@ class spell_pilgrims_bounty_serve_generic : public AuraScript
|
||||
void OnAuraRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
|
||||
{
|
||||
Unit* target = GetTarget();
|
||||
if (target->GetTypeId() == TYPEID_UNIT)
|
||||
if (target->IsCreature())
|
||||
target->ToCreature()->AI()->DoAction(GetSpellInfo()->Id);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user