ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(Core/Object): adds consistency in the use of type object check (#19671)

Browse source
This commit is contained in:
Grimdhex 2024-08-25 14:57:37 +02:00 • committed by GitHub
parent 61f3a631c3
commit 643362d697
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
189 changed files with 783 additions and 775 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/server/scripts/Spells/spell_warlock.cpp
View file

@ -171,7 +171,7 @@ class spell_warl_improved_demonic_tactics : public AuraScript
bool Load() override
{
return GetUnitOwner()->GetTypeId() == TYPEID_PLAYER;
return GetUnitOwner()->IsPlayer();
}
void CalcPeriodic(AuraEffect const* /*aurEff*/, bool& isPeriodic, int32& amplitude)
@ -223,7 +223,7 @@ class spell_warl_ritual_of_summoning : public SpellScript
SpellCastResult CheckCast()
{
if (GetCaster()->GetTypeId() == TYPEID_PLAYER)
if (GetCaster()->IsPlayer())
if (GetCaster()->ToPlayer()->InBattleground())
return SPELL_FAILED_NOT_IN_BATTLEGROUND;
return SPELL_CAST_OK;
@ -339,7 +339,7 @@ class spell_warl_generic_scaling : public AuraScript
amount = CalculatePct(std::max<int32>(0, maximum), 15);
// xinef: Update appropriate player field
if (owner->GetTypeId() == TYPEID_PLAYER)
if (owner->IsPlayer())
owner->SetUInt32Value(PLAYER_PET_SPELL_POWER, (uint32)amount);
}
}
@ -450,7 +450,7 @@ class spell_warl_infernal_scaling : public AuraScript
amount = CalculatePct(std::max<int32>(0, maximum), 15);
// xinef: Update appropriate player field
if (owner->GetTypeId() == TYPEID_PLAYER)
if (owner->IsPlayer())
owner->SetUInt32Value(PLAYER_PET_SPELL_POWER, (uint32)amount);
}
}
@ -900,7 +900,7 @@ class spell_warl_life_tap : public SpellScript
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
return GetCaster()->IsPlayer();
}
bool Validate(SpellInfo const* /*spell*/) override
@ -1147,7 +1147,7 @@ class spell_warl_curse_of_doom : public AuraScript
bool Load() override
{
return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER;
return GetCaster() && GetCaster()->IsPlayer();
}
void OnRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
@ -1322,7 +1322,7 @@ class spell_warl_drain_soul : public AuraScript
Unit* caster = GetCaster();
Unit* target = GetTarget();
if (caster && caster->GetTypeId() == TYPEID_PLAYER && caster->ToPlayer()->isHonorOrXPTarget(target))
if (caster && caster->IsPlayer() && caster->ToPlayer()->isHonorOrXPTarget(target))
{
if (roll_chance_i(20))
{