nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-22 21:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core): Make more use of helpers. (#19835)

Browse Source 
* 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:
Benjamin Jackson
2024-09-03 13:41:31 -04:00
committed by GitHub
parent e3e4133e88
commit 1edac37ac3
165 changed files with 725 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
View File

@@ -1194,7 +1194,7 @@ class spell_illidan_demon_transform1_aura : public AuraScript
bool Load() override
{
return GetUnitOwner()->GetTypeId() == TYPEID_UNIT;
return GetUnitOwner()->IsCreature();
}
void OnPeriodic(AuraEffect const* /*aurEff*/)
@@ -1222,7 +1222,7 @@ class spell_illidan_demon_transform2_aura : public AuraScript
bool Load() override
{
return GetUnitOwner()->GetTypeId() == TYPEID_UNIT;
return GetUnitOwner()->IsCreature();
}
void OnPeriodic(AuraEffect const* aurEff)
@@ -1313,7 +1313,7 @@ class spell_illidan_cage_trap : public SpellScript
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_UNIT;
return GetCaster()->IsCreature();
}
void HandleScriptEffect(SpellEffIndex effIndex)

4
src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
View File

@@ -607,7 +607,7 @@ class spell_illidari_council_empyreal_balance : public SpellScript
bool Load() override
{
_targetCount = 0;
return GetCaster()->GetTypeId() == TYPEID_UNIT;
return GetCaster()->IsCreature();
}
void HandleDummy(SpellEffIndex effIndex)
@@ -652,7 +652,7 @@ class spell_illidari_council_empyreal_equivalency : public SpellScript
bool Load() override
{
_targetCount = 0;
return GetCaster()->GetTypeId() == TYPEID_UNIT;
return GetCaster()->IsCreature();
}
void HandleDummy(SpellEffIndex effIndex)

2
src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
View File

@@ -141,7 +141,7 @@ public:
void MoveInLineOfSight(Unit* who) override
{
if (!who || me->getStandState() != UNIT_STAND_STATE_SLEEP || who->GetTypeId() != TYPEID_PLAYER || me->GetDistance2d(who) > 90.0f || who->ToPlayer()->IsGameMaster())
if (!who || me->getStandState() != UNIT_STAND_STATE_SLEEP || !who->IsPlayer() || me->GetDistance2d(who) > 90.0f || who->ToPlayer()->IsGameMaster())
return;
me->SetInCombatWithZone();

2
src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
View File

@@ -264,7 +264,7 @@ class spell_teron_gorefiend_shadowy_construct : public AuraScript
bool Load() override
{
return GetUnitOwner()->GetTypeId() == TYPEID_UNIT;
return GetUnitOwner()->IsCreature();
}
void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)

2
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
View File

@@ -82,7 +82,7 @@ public:
void OnUnitDeath(Unit* unit) override
{
if (unit && unit->GetTypeId() == TYPEID_UNIT && unit->GetEntry() == NPC_NASCENT_FEL_ORC)
if (unit && unit->IsCreature() && unit->GetEntry() == NPC_NASCENT_FEL_ORC)
PrisonerDied(unit->GetGUID());
}

4
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
View File

@@ -1078,7 +1078,7 @@ class spell_kaelthas_kael_phase_two : public SpellScript
bool Load() override
{
if (GetCaster()->GetTypeId() == TYPEID_UNIT)
if (GetCaster()->IsCreature())
if (InstanceScript* instance = GetCaster()->GetInstanceScript())
if (Creature* kael = instance->GetCreature(DATA_KAELTHAS))
kael->AI()->SummonedCreatureDies(GetCaster()->ToCreature(), nullptr);
@@ -1196,7 +1196,7 @@ class spell_kaelthas_flame_strike : public AuraScript
bool Load() override
{
return GetUnitOwner()->GetTypeId() == TYPEID_UNIT;
return GetUnitOwner()->IsCreature();
}
void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)