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

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
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
165 changed files with 725 additions and 719 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/server/scripts/Commands/cs_debug.cpp
View file

@ -263,7 +263,7 @@ public:
Unit* unit = handler->getSelectedUnit();
Player* player = nullptr;
if (!unit || (unit->GetTypeId() != TYPEID_PLAYER))
if (!unit || (!unit->IsPlayer()))
{
player = handler->GetSession()->GetPlayer();
}

8
src/server/scripts/Commands/cs_misc.cpp
View file

@ -1142,7 +1142,7 @@ public:
{
if (sWorld->getBoolConfig(CONFIG_DIE_COMMAND_MODE))
{
if (target->GetTypeId() == TYPEID_UNIT && handler->GetSession()->GetSecurity() == SEC_CONSOLE) // pussywizard
if (target->IsCreature() && handler->GetSession()->GetSecurity() == SEC_CONSOLE) // pussywizard
{
target->ToCreature()->LowerPlayerDamageReq(target->GetMaxHealth());
}
@ -2393,7 +2393,7 @@ public:
Unit* target = handler->getSelectedUnit();
if (player->GetTarget() && target)
{
if (target->GetTypeId() != TYPEID_UNIT || target->IsPet())
if (!target->IsCreature() || target->IsPet())
{
handler->SendErrorMessage(LANG_SELECT_CREATURE);
return false;
@ -2745,7 +2745,7 @@ public:
}
case HOME_MOTION_TYPE:
{
if (unit->GetTypeId() == TYPEID_UNIT)
if (unit->IsCreature())
{
handler->PSendSysMessage(LANG_MOVEGENS_HOME_CREATURE, x, y, z);
}
@ -2816,7 +2816,7 @@ public:
if (!target->IsAlive() || !damage)
return true;
if (target->GetTypeId() == TYPEID_UNIT && handler->GetSession()->GetSecurity() == SEC_CONSOLE) // pussywizard
if (target->IsCreature() && handler->GetSession()->GetSecurity() == SEC_CONSOLE) // pussywizard
target->ToCreature()->LowerPlayerDamageReq(target->GetMaxHealth());
if (percent)

2
src/server/scripts/Commands/cs_npc.cpp
View file

@ -336,7 +336,7 @@ public:
return false;
Unit* unit = handler->getSelectedUnit();
if (!unit || unit->GetTypeId() != TYPEID_UNIT)
if (!unit || !unit->IsCreature())
{
handler->SendErrorMessage(LANG_SELECT_CREATURE);
return false;

2
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
View file

@ -221,7 +221,7 @@ public:
void IsSummonedBy(WorldObject* summoner) override
{
if (summoner->GetTypeId() != TYPEID_UNIT)
if (!summoner->IsCreature())
{
return;
}

4
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
View file

@ -212,7 +212,7 @@ struct ClassCallSelector : public Acore::unary_function<Unit*, bool>
bool operator()(Unit const* target) const
{
if (!_me || !target || target->GetTypeId() != TYPEID_PLAYER)
if (!_me || !target || !target->IsPlayer())
{
return false;
}
@ -1114,7 +1114,7 @@ class spell_class_call_polymorph : public SpellScript
{
targets.remove_if([&](WorldObject const* target) -> bool
{
return target->GetTypeId() != TYPEID_PLAYER || target->ToPlayer()->IsGameMaster() || target->ToPlayer()->HasAura(SPELL_POLYMORPH);
return !target->IsPlayer() || target->ToPlayer()->IsGameMaster() || target->ToPlayer()->HasAura(SPELL_POLYMORPH);
});
if (!targets.empty())

2
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp
View file

@ -110,7 +110,7 @@ public:
bool CanAIAttack(Unit const* target) const override
{
if (target->GetTypeId() == TYPEID_UNIT && !secondPhase)
if (target->IsCreature() && !secondPhase)
{
return false;
}

2
src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
View file

@ -587,7 +587,7 @@ class spell_hate_to_zero : public SpellScript
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_UNIT;
return GetCaster()->IsCreature();
}
void HandleHit(SpellEffIndex /*effIndex*/)

2
src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.cpp
View file

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

2
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
View file

@ -155,7 +155,7 @@ struct boss_priestess_delrissa : public ScriptedAI
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() != TYPEID_PLAYER)
if (!victim->IsPlayer())
return;
if (PlayersKilled < SAY_DEATH)

2
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
View file

@ -678,7 +678,7 @@ public:
void MoveInLineOfSight(Unit* who) override
{
if (PlayerGUID || who->GetTypeId() != TYPEID_PLAYER || !who->IsWithinDist(me, INTERACTION_DISTANCE))
if (PlayerGUID || !who->IsPlayer() || !who->IsWithinDist(me, INTERACTION_DISTANCE))
return;
if (MeetQuestCondition(who->ToPlayer()))

2
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
View file

@ -458,7 +458,7 @@ public:
{
Position pos = LightOfDawnFightPos[urand(0, 9)];
if (Unit* target = cr->SelectNearbyTarget(nullptr, 10.0f))
if (target->GetTypeId() == TYPEID_UNIT)
if (target->IsCreature())
target->GetMotionMaster()->MoveCharge(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), me->GetSpeed(MOVE_RUN));
cr->GetMotionMaster()->MoveCharge(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), me->GetSpeed(MOVE_RUN));
}

2
src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
View file

@ -389,7 +389,7 @@ public:
void IsSummonedBy(WorldObject* summoner) override
{
if (summoner->GetTypeId() != TYPEID_UNIT)
if (!summoner->IsCreature())
{
return;
}

2
src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
View file

@ -64,7 +64,7 @@ public:
void OnUnitDeath(Unit* unit) override
{
if (unit->GetTypeId() == TYPEID_UNIT && unit->GetCreatureType() == CREATURE_TYPE_DRAGONKIN && unit->GetEntry() != NPC_SHADE_OF_ERANIKUS)
if (unit->IsCreature() && unit->GetCreatureType() == CREATURE_TYPE_DRAGONKIN && unit->GetEntry() != NPC_SHADE_OF_ERANIKUS)
_dragonkinList.remove(unit->GetGUID());
if (unit->GetEntry() == NPC_JAMMAL_AN_THE_PROPHET)
{

2
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
View file

@ -533,7 +533,7 @@ class DoorsGuidCheck
public:
bool operator()(WorldObject* object) const
{
if (object->GetTypeId() != TYPEID_UNIT)
if (!object->IsCreature())
return true;
Creature* cr = object->ToCreature();

4
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
View file

@ -1088,7 +1088,7 @@ class spell_kiljaeden_sinister_reflection_clone : public SpellScript
WorldObject* target = targets.front();
targets.clear();
if (target && target->GetTypeId() == TYPEID_UNIT)
if (target && target->IsCreature())
{
target->ToCreature()->AI()->SetData(1, GetCaster()->getClass());
targets.push_back(target);
@ -1133,7 +1133,7 @@ class spell_kiljaeden_darkness_aura : public AuraScript
void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (GetUnitOwner()->GetTypeId() == TYPEID_UNIT)
if (GetUnitOwner()->IsCreature())
GetUnitOwner()->ToCreature()->AI()->DoAction(ACTION_NO_KILL_TALK);
GetUnitOwner()->CastSpell(GetUnitOwner(), SPELL_DARKNESS_OF_A_THOUSAND_SOULS_DAMAGE, true);

2
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
View file

@ -393,7 +393,7 @@ class spell_entropius_negative_energy : public SpellScript
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_UNIT;
return GetCaster()->IsCreature();
}
void FilterTargets(std::list<WorldObject*>& targets)

2
src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
View file

@ -183,7 +183,7 @@ public:
bool Load() override
{
return GetUnitOwner()->GetTypeId() == TYPEID_UNIT && GetUnitOwner()->GetMapId() == MAP_ULDAMAN;
return GetUnitOwner()->IsCreature() && GetUnitOwner()->GetMapId() == MAP_ULDAMAN;
}
void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)

8
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
View file

@ -209,7 +209,7 @@ public:
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() != TYPEID_PLAYER)
if (!victim->IsPlayer())
return;
reviveGUID = victim->GetGUID();
@ -449,7 +449,7 @@ public:
{
if (!me || !target)
return false;
if (target->GetTypeId() != TYPEID_PLAYER || !me->IsWithinLOSInMap(target))
if (!target->IsPlayer() || !me->IsWithinLOSInMap(target))
return false;
return true;
}))
@ -540,7 +540,7 @@ public:
void JustEngagedWith(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER)
if (!who->IsPlayer())
return;
_scheduler.Schedule(6s, 12s, [this](TaskContext context)
@ -557,7 +557,7 @@ public:
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() != TYPEID_PLAYER)
if (!victim->IsPlayer())
return;
reviveGUID = victim->GetGUID();

2
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
View file

@ -217,7 +217,7 @@ private:
{
Unit* target = SelectTarget(SelectTargetMethod::Random, 0, [this](Unit* target) -> bool
{
if (target->GetTypeId() != TYPEID_PLAYER || target->getPowerType() != Powers::POWER_MANA)
if (!target->IsPlayer() || target->getPowerType() != Powers::POWER_MANA)
return false;
if (me->IsWithinMeleeRange(target) || me->GetVictim() == target)
return false;

6
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
View file

@ -239,7 +239,7 @@ public:
{
if (Unit* summoner = me->ToTempSummon()->GetSummonerUnit())
{
if (summoner->GetTypeId() == TYPEID_UNIT && summoner->IsAlive() && !summoner->IsInCombat())
if (summoner->IsCreature() && summoner->IsAlive() && !summoner->IsInCombat())
summoner->ToCreature()->AI()->AttackStart(who);
}
}
@ -253,7 +253,7 @@ public:
{
if (Unit* summoner = me->ToTempSummon()->GetSummonerUnit())
{
if (summoner->GetTypeId() == TYPEID_UNIT && summoner->IsAlive())
if (summoner->IsCreature() && summoner->IsAlive())
summoner->ToCreature()->DisappearAndDie();
}
}
@ -267,7 +267,7 @@ public:
if (me->IsSummon())
{
Unit* summoner = me->ToTempSummon()->GetSummonerUnit();
if (summoner && summoner->GetTypeId() == TYPEID_UNIT && summoner->IsAIEnabled)
if (summoner && summoner->IsCreature() && summoner->IsAIEnabled)
{
npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI* ai =
CAST_AI(npc_lord_gregor_lescovar::npc_lord_gregor_lescovarAI, summoner->GetAI());

2
src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp
View file

@ -140,7 +140,7 @@ public:
void MoveInLineOfSight(Unit* who) override
{
if (!who || who->GetTypeId() != TYPEID_PLAYER)
if (!who || !who->IsPlayer())
return;
if (me->FindNearestGameObject(GO_BEACON_TORCH, 10.0f))

2
src/server/scripts/Events/brewfest.cpp
View file

@ -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;
}

4
src/server/scripts/Events/midsummer.cpp
View file

@ -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())

2
src/server/scripts/Events/pilgrims_bounty.cpp
View file

@ -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);
}

2
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp
View file

@ -90,7 +90,7 @@ struct boss_aeonus : public BossAI
void MoveInLineOfSight(Unit* who) override
{
if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_TIME_KEEPER)
if (who->IsCreature() && who->GetEntry() == NPC_TIME_KEEPER)
{
if (me->IsWithinDistInMap(who, 20.0f))
{

2
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp
View file

@ -79,7 +79,7 @@ enum Spells
void MoveInLineOfSight(Unit* who) override
{
if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_TIME_KEEPER)
if (who->IsCreature() && who->GetEntry() == NPC_TIME_KEEPER)
{
if (me->IsWithinDistInMap(who, 20.0f))
{

2
src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp
View file

@ -90,7 +90,7 @@ struct boss_temporus : public BossAI
void MoveInLineOfSight(Unit* who) override
{
if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_TIME_KEEPER)
if (who->IsCreature() && who->GetEntry() == NPC_TIME_KEEPER)
{
if (me->IsWithinDistInMap(who, 20.0f))
{

2
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
View file

@ -367,7 +367,7 @@ struct boss_vem : public boss_bug_trio
{
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, [this](Unit* target) -> bool
{
if (target->GetTypeId() != TYPEID_PLAYER)
if (!target->IsPlayer())
return false;
if (me->IsWithinMeleeRange(target) || target == me->GetVictim())
return false;

2
src/server/scripts/Kalimdor/zone_durotar.cpp
View file

@ -180,7 +180,7 @@ public:
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() != TYPEID_UNIT || !victim->IsSummon())
if (!victim->IsCreature() || !victim->IsSummon())
return;
if (Unit* vehSummoner = victim->ToTempSummon()->GetSummonerUnit())

4
src/server/scripts/Kalimdor/zone_the_barrens.cpp
View file

@ -124,7 +124,7 @@ public:
return;
//only aggro text if not player and only in this area
if (who->GetTypeId() != TYPEID_PLAYER && me->GetAreaId() == AREA_MERCHANT_COAST)
if (!who->IsPlayer() && me->GetAreaId() == AREA_MERCHANT_COAST)
{
//appears to be pretty much random (possible only if escorter not in combat with who yet?)
Talk(SAY_GIL_AGGRO, who);
@ -325,7 +325,7 @@ public:
void MoveInLineOfSight(Unit* who) override
{
if (!who->IsAlive() || EventInProgress || who->GetTypeId() != TYPEID_PLAYER)
if (!who->IsAlive() || EventInProgress || !who->IsPlayer())
return;
if (me->IsWithinDistInMap(who, 10.0f) && who->ToPlayer()->GetQuestStatus(1719) == QUEST_STATUS_INCOMPLETE)

2
src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
View file

@ -95,7 +95,7 @@ public:
void MoveInLineOfSight(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER)
if (!who->IsPlayer())
return;
if (!_initTalk)

6
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
View file

@ -347,7 +347,7 @@ class spell_herald_volzaj_insanity : public SpellScript
{
PrepareSpellScript(spell_herald_volzaj_insanity);
bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; }
bool Load() override { return GetCaster()->IsCreature(); }
void HandleDummyEffect(std::list<WorldObject*>& targets)
{
@ -362,7 +362,7 @@ class spell_herald_volzaj_insanity : public SpellScript
{
targets.remove_if([this](WorldObject* targetObj) -> bool
{
return !targetObj || targetObj->GetTypeId() != TYPEID_PLAYER || !targetObj->ToPlayer()->IsInCombatWith(GetCaster()) ||
return !targetObj || !targetObj->IsPlayer() || !targetObj->ToPlayer()->IsInCombatWith(GetCaster()) ||
targetObj->GetDistance(GetCaster()) >= (MAX_VISIBILITY_DISTANCE * 2);
});
}
@ -466,7 +466,7 @@ class spell_volazj_whisper : public SpellScript
});
}
bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; }
bool Load() override { return GetCaster()->IsCreature(); }
void HandleScriptEffect(SpellEffIndex /* effIndex */)
{

2
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
View file

@ -333,7 +333,7 @@ struct boss_jedoga_shadowseeker : public BossAI
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER)
if (!who->IsPlayer())
{
return;
}

2
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
View file

@ -307,7 +307,7 @@ struct boss_taldaram : public BossAI
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() != TYPEID_PLAYER)
if (!victim->IsPlayer())
{
return;
}

2
src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
View file

@ -925,7 +925,7 @@ struct boss_sartharion_dragonAI : public BossAI
void KilledUnit(Unit* victim) final
{
if (victim->GetTypeId() != TYPEID_PLAYER || urand(0, 2))
if (!victim->IsPlayer() || urand(0, 2))
{
return;
}

6
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
View file

@ -1053,7 +1053,7 @@ class spell_halion_twilight_phasing : public SpellScript
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_UNIT;
return GetCaster()->IsCreature();
}
void Phase()
@ -1116,7 +1116,7 @@ class spell_halion_twilight_realm_aura : public AuraScript
return;
target->RemoveAurasDueToSpell(SPELL_FIERY_COMBUSTION, ObjectGuid::Empty, 0, AURA_REMOVE_BY_ENEMY_SPELL);
if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
if (!GetTarget()->IsPlayer())
return;
GetTarget()->m_Events.AddEvent(new SendEncounterUnit(GetTarget()->ToPlayer()), GetTarget()->m_Events.CalculateTime(500));
}
@ -1149,7 +1149,7 @@ class spell_halion_leave_twilight_realm_aura : public AuraScript
{
GetTarget()->RemoveAurasDueToSpell(SPELL_TWILIGHT_REALM);
if (GetTarget()->GetTypeId() != TYPEID_PLAYER)
if (!GetTarget()->IsPlayer())
return;
GetTarget()->m_Events.AddEvent(new SendEncounterUnit(GetTarget()->ToPlayer()), GetTarget()->m_Events.CalculateTime(500));
}

2
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
View file

@ -765,7 +765,7 @@ class spell_toc5_light_rain : public SpellScript
{
for( std::list<WorldObject*>::iterator itr = targets.begin(); itr != targets.end(); )
{
if ((*itr)->GetTypeId() == TYPEID_UNIT)
if ((*itr)->IsCreature())
if ((*itr)->ToCreature()->GetEntry() == NPC_FOUNTAIN_OF_LIGHT)
{
targets.erase(itr);

2
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
View file

@ -691,7 +691,7 @@ public:
if( me->GetExactDist(plr) <= 5.0f )
if( Vehicle* v = plr->GetVehicle() )
if( Unit* c = v->GetBase() )
if( c->GetTypeId() == TYPEID_UNIT && c->ToCreature()->GetEntry() == (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? VEHICLE_ARGENT_BATTLEWORG : VEHICLE_ARGENT_WARHORSE) )
if( c->IsCreature() && c->ToCreature()->GetEntry() == (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? VEHICLE_ARGENT_BATTLEWORG : VEHICLE_ARGENT_WARHORSE) )
{
me->GetMotionMaster()->MovementExpired();
me->GetMotionMaster()->MoveIdle();

2
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
View file

@ -1156,7 +1156,7 @@ public:
{
NPC_BlackKnightGUID = bk->GetGUID();
bk->SendMovementFlagUpdate(); // put him on vehicle visually
if( bk->GetTypeId() == TYPEID_UNIT )
if( bk->IsCreature() )
bk->ToCreature()->SetReactState(REACT_PASSIVE);
}

4
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
View file

@ -400,7 +400,7 @@ public:
void MoveInLineOfSight(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER || me->GetExactDistSq(who) > 6400.0f) // 80yd*80yd
if (!who->IsPlayer() || me->GetExactDistSq(who) > 6400.0f) // 80yd*80yd
return;
if (me->getStandState() != UNIT_STAND_STATE_STAND)
@ -846,7 +846,7 @@ public:
{
target->UpdatePosition(*c, false);
target->CastCustomSpell(SPELL_SPIKE_FAIL, SPELLVALUE_MAX_TARGETS, 1);
if( target->GetTypeId() == TYPEID_UNIT )
if( target->IsCreature() )
target->ToCreature()->AI()->DoAction(-1);
Remove();
return;

6
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
View file

@ -172,7 +172,7 @@ public:
break;
case EVENT_SPELL_FIRE_BOMB:
{
if( t->GetTypeId() != TYPEID_PLAYER && pInstance )
if( !t->IsPlayer() && pInstance )
{
GuidVector validPlayers;
Map::PlayerList const& pl = me->GetMap()->GetPlayers();
@ -342,7 +342,7 @@ public:
if( Vehicle* vk = me->GetVehicleKit() )
if( Unit* snobold = vk->GetPassenger(4) )
{
if( snobold->GetTypeId() == TYPEID_UNIT )
if( snobold->IsCreature() )
{
CAST_AI(npc_snobold_vassal::npc_snobold_vassalAI, snobold->ToCreature()->AI())->TargetGUID = PlayerGUID;
snobold->ToCreature()->AI()->AttackStart(p);
@ -357,7 +357,7 @@ public:
{
events.RescheduleEvent(EVENT_PICK_SNOBOLD_TARGET, 5s);
if( Unit* snobold = vk->GetPassenger(4) )
if( snobold->GetTypeId() == TYPEID_UNIT )
if( snobold->IsCreature() )
{
bool needDespawn = true;
for( uint8 i = 0; i < 4; ++i )

2
src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
View file

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

4
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
View file

@ -258,7 +258,7 @@ public:
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() != TYPEID_PLAYER)
if (!victim->IsPlayer())
return;
int32 textId = 0;
@ -347,7 +347,7 @@ class spell_wailing_souls_periodic_aura : public AuraScript
{
t->SetControlled(false, UNIT_STATE_ROOT);
t->DisableRotate(false);
if (t->GetTypeId() == TYPEID_UNIT)
if (t->IsCreature())
t->ToCreature()->SetReactState(REACT_AGGRESSIVE);
if (t->GetVictim())
{

2
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
View file

@ -333,7 +333,7 @@ class spell_garfrost_permafrost : public SpellScript
if (valid)
{
if (Aura* aur = target->ToUnit()->GetAura(70336))
if (aur->GetStackAmount() >= 10 && caster->GetTypeId() == TYPEID_UNIT)
if (aur->GetStackAmount() >= 10 && caster->IsCreature())
caster->ToCreature()->AI()->SetData(1, aur->GetStackAmount());
targetList.push_back(*itrU);
}

4
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
View file

@ -470,7 +470,7 @@ class spell_krick_explosive_barrage_aura : public AuraScript
{
PreventDefaultAction();
if (Unit* caster = GetCaster())
if (caster->GetTypeId() == TYPEID_UNIT)
if (caster->IsCreature())
{
Map::PlayerList const& players = caster->GetMap()->GetPlayers();
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
@ -505,7 +505,7 @@ class spell_exploding_orb_auto_grow_aura : public AuraScript
target->RemoveAurasDueToSpell(SPELL_HASTY_GROW);
target->RemoveAurasDueToSpell(SPELL_AUTO_GROW);
target->RemoveAurasDueToSpell(SPELL_EXPLODING_ORB_VISUAL);
if (target->GetTypeId() == TYPEID_UNIT)
if (target->IsCreature())
target->ToCreature()->DespawnOrUnsummon(2000);
}
}

2
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
View file

@ -1405,7 +1405,7 @@ class spell_pos_rimefang_frost_nova : public SpellScript
if (Unit* caster = GetCaster())
{
Unit::Kill(caster, target);
if (target->GetTypeId() == TYPEID_UNIT)
if (target->IsCreature())
target->ToCreature()->DespawnOrUnsummon(30000);
}
}

14
src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
View file

@ -343,7 +343,7 @@ public:
void DamageDealt(Unit* target, uint32& damage, DamageEffectType /*damageType*/) override
{
if (target->GetTypeId() != TYPEID_PLAYER)
if (!target->IsPlayer())
return;
if (damage > RAID_MODE<uint32>(23000, 25000, 23000, 25000))
@ -613,7 +613,7 @@ public:
void DamageDealt(Unit* target, uint32& damage, DamageEffectType /*damageType*/) override
{
if (target->GetTypeId() != TYPEID_PLAYER)
if (!target->IsPlayer())
return;
if (damage > RAID_MODE<uint32>(23000, 25000, 23000, 25000))
@ -907,7 +907,7 @@ public:
void DamageDealt(Unit* target, uint32& damage, DamageEffectType /*damageType*/) override
{
if (target->GetTypeId() != TYPEID_PLAYER)
if (!target->IsPlayer())
return;
if (damage > RAID_MODE<uint32>(23000, 25000, 23000, 25000))
@ -1102,7 +1102,7 @@ public:
if (_introDone)
return;
if (who->GetTypeId() != TYPEID_PLAYER || me->GetExactDist2d(who) > 100.0f)
if (!who->IsPlayer() || me->GetExactDist2d(who) > 100.0f)
{
return;
}
@ -1335,7 +1335,7 @@ public:
void DamageDealt(Unit* target, uint32& damage, DamageEffectType /*damageType*/) override
{
if (target->GetTypeId() != TYPEID_PLAYER)
if (!target->IsPlayer())
{
return;
}
@ -1506,7 +1506,7 @@ class spell_taldaram_summon_flame_ball : public SpellScript
bool Load() override
{
if (GetCaster()->GetTypeId() != TYPEID_UNIT)
if (!GetCaster()->IsCreature())
{
return false;
}
@ -1573,7 +1573,7 @@ class spell_valanar_kinetic_bomb_aura : public AuraScript
void HandleDummyTick(AuraEffect const* /*aurEff*/)
{
Unit* target = GetTarget();
if (target->GetTypeId() != TYPEID_UNIT)
if (!target->IsCreature())
return;
if (Creature* bomb = target->FindNearestCreature(NPC_KINETIC_BOMB, 1.0f, true))

2
src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
View file

@ -823,7 +823,7 @@ class spell_blood_queen_vampiric_bite : public SpellScript
return;
}
if (GetCaster()->GetTypeId() != TYPEID_PLAYER || GetCaster()->GetMapId() != 631)
if (!GetCaster()->IsPlayer() || GetCaster()->GetMapId() != 631)
return;
InstanceScript* instance = GetCaster()->GetInstanceScript();
if (!instance || instance->GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) != IN_PROGRESS)

2
src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
View file

@ -1259,7 +1259,7 @@ class spell_deathbringer_boiling_blood : public SpellScript
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_UNIT;
return GetCaster()->IsCreature();
}
void FilterTargets(std::list<WorldObject*>& targets)

6
src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
View file

@ -290,13 +290,13 @@ class spell_festergut_pungent_blight : public SpellScript
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_UNIT;
return GetCaster()->IsCreature();
}
void HandleScript(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
if (caster->GetTypeId() != TYPEID_UNIT)
if (!caster->IsCreature())
return;
// Get Inhaled Blight id for our difficulty
@ -383,7 +383,7 @@ public:
bool OnCheck(Player* /*source*/, Unit* target, uint32 /*criteria_id*/) override
{
if (target && target->GetTypeId() == TYPEID_UNIT)
if (target && target->IsCreature())
return target->ToCreature()->AI()->GetData(DATA_INOCULATED_STACK) < 3;
return false;

12
src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
View file

@ -602,7 +602,7 @@ public:
Transport::PassengerSet const& passengers = t->GetStaticPassengers();
for (Transport::PassengerSet::const_iterator itr = passengers.begin(); itr != passengers.end(); ++itr)
{
if ((*itr)->GetTypeId() != TYPEID_UNIT || (*itr)->GetEntry() != NPC_GUNSHIP_HULL)
if (!(*itr)->IsCreature() || (*itr)->GetEntry() != NPC_GUNSHIP_HULL)
continue;
(*itr)->ToCreature()->CastSpell((*itr)->ToCreature(), explosionSpell, true);
}
@ -615,7 +615,7 @@ public:
Transport::PassengerSet const& passengers = t->GetStaticPassengers();
for (Transport::PassengerSet::const_iterator itr = passengers.begin(); itr != passengers.end(); ++itr)
{
if ((*itr)->GetTypeId() != TYPEID_UNIT || (*itr)->GetEntry() != cannonEntry)
if (!(*itr)->IsCreature() || (*itr)->GetEntry() != cannonEntry)
continue;
Creature* cannon = (*itr)->ToCreature();
cannon->CastSpell(cannon, SPELL_EJECT_ALL_PASSENGERS, true);
@ -661,7 +661,7 @@ public:
Transport::PassengerSet const& passengers = t->GetPassengers();
for (Transport::PassengerSet::const_iterator itr = passengers.begin(); itr != passengers.end(); ++itr)
{
if ((*itr)->GetTypeId() != TYPEID_UNIT)
if (!(*itr)->IsCreature())
continue;
Creature* c = (*itr)->ToCreature();
if (c->GetEntry() == NPC_SKYBREAKER_MARINE || c->GetEntry() == NPC_SKYBREAKER_SERGEANT || c->GetEntry() == NPC_KOR_KRON_REAVER || c->GetEntry() == NPC_KOR_KRON_SERGEANT)
@ -2080,7 +2080,7 @@ class spell_igb_check_for_players : public SpellScript
bool Load() override
{
_playerCount = 0;
return GetCaster()->GetTypeId() == TYPEID_UNIT;
return GetCaster()->IsCreature();
}
void CountTargets(std::list<WorldObject*>& targets)
@ -2302,7 +2302,7 @@ class spell_igb_cannon_blast : public SpellScript
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_UNIT;
return GetCaster()->IsCreature();
}
void CalculatePower()
@ -2467,7 +2467,7 @@ public:
bool operator()(WorldObject* unit)
{
return unit->GetTypeId() != TYPEID_PLAYER || unit->GetPositionZ() > 478.0f || !unit->GetTransport() || unit->GetTransport()->GetEntry() != _entry
return !unit->IsPlayer() || unit->GetPositionZ() > 478.0f || !unit->GetTransport() || unit->GetTransport()->GetEntry() != _entry
|| unit->GetMapHeight(unit->GetPhaseMask(), unit->GetPositionX(), unit->GetPositionY(), unit->GetPositionZ()) < 465.0f;
}

4
src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
View file

@ -84,7 +84,7 @@ public:
if (target->GetExactDist(_source) > 175.0f)
return false;
if (target->GetTypeId() != TYPEID_PLAYER)
if (!target->IsPlayer())
return false;
if (target->GetPositionX() > -337.0f)
@ -415,7 +415,7 @@ public:
{
if (Unit* u = v->GetBase())
{
if (u->GetEntry() == NPC_BONE_SPIKE && u->GetTypeId() == TYPEID_UNIT)
if (u->GetEntry() == NPC_BONE_SPIKE && u->IsCreature())
{
u->ToCreature()->AI()->DoAction(-1337);
}

8
src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
View file

@ -209,7 +209,7 @@ public:
bool operator()(Unit const* target) const
{
if (!me || !target || target->GetTypeId() != TYPEID_PLAYER)
if (!me || !target || !target->IsPlayer())
return false;
if (me->IsWithinCombatRange(target, 7.0f))
@ -952,7 +952,7 @@ class spell_putricide_unstable_experiment : public SpellScript
void HandleScript(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
if (GetCaster()->GetTypeId() != TYPEID_UNIT)
if (!GetCaster()->IsCreature())
return;
Creature* creature = GetCaster()->ToCreature();
@ -1044,7 +1044,7 @@ class spell_putricide_ooze_channel : public SpellScript
bool Load() override
{
_target = nullptr;
return GetCaster()->GetTypeId() == TYPEID_UNIT;
return GetCaster()->IsCreature();
}
void SelectTarget(std::list<WorldObject*>& targets)
@ -1318,7 +1318,7 @@ class spell_putricide_mutation_init : public SpellScript
if (!GetExplTargetUnit())
return SPELL_FAILED_BAD_TARGETS;
if (GetExplTargetUnit()->GetTypeId() != TYPEID_PLAYER)
if (!GetExplTargetUnit()->IsPlayer())
return SPELL_FAILED_TARGET_NOT_PLAYER;
SpellCustomErrors extension = SPELL_CUSTOM_ERROR_NONE;

8
src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
View file

@ -360,7 +360,7 @@ public:
if (!summoner)
return;
if (summoner->GetTypeId() != TYPEID_UNIT)
if (!summoner->IsCreature())
{
return;
}
@ -651,7 +651,7 @@ class spell_rotface_large_ooze_combine : public SpellScript
if (Creature* rotface = ObjectAccessor::GetCreature(*GetCaster(), instance->GetGuidData(DATA_ROTFACE)))
if (rotface->IsAlive())
{
if (GetCaster()->GetTypeId() == TYPEID_UNIT)
if (GetCaster()->IsCreature())
GetCaster()->ToCreature()->AI()->Talk(EMOTE_UNSTABLE_EXPLOSION);
rotface->AI()->Talk(SAY_UNSTABLE_EXPLOSION);
}
@ -708,7 +708,7 @@ class spell_rotface_large_ooze_buff_combine : public SpellScript
if (Creature* rotface = ObjectAccessor::GetCreature(*GetCaster(), instance->GetGuidData(DATA_ROTFACE)))
if (rotface->IsAlive())
{
if (GetCaster()->GetTypeId() == TYPEID_UNIT)
if (GetCaster()->IsCreature())
GetCaster()->ToCreature()->AI()->Talk(EMOTE_UNSTABLE_EXPLOSION);
rotface->AI()->Talk(SAY_UNSTABLE_EXPLOSION);
}
@ -792,7 +792,7 @@ class spell_rotface_unstable_ooze_explosion_suicide_aura : public AuraScript
{
PreventDefaultAction();
Unit* target = GetTarget();
if (target->GetTypeId() != TYPEID_UNIT)
if (!target->IsCreature())
return;
target->SetVisible(false);

4
src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
View file

@ -252,7 +252,7 @@ public:
if (target->GetExactDist(_source) > 80.0f)
return false;
if (target->GetTypeId() != TYPEID_PLAYER)
if (!target->IsPlayer())
return false;
if (target->HasAura(SPELL_FROST_IMBUED_BLADE))
@ -1154,7 +1154,7 @@ class spell_sindragosa_soul_preservation_aura : public AuraScript
{
s->CastSpell(s, 72466, true);
s->RemoveAurasDueToSpell(72424);
if (s->GetTypeId() == TYPEID_UNIT) s->ToCreature()->SetLootMode(3);
if (s->IsCreature()) s->ToCreature()->SetLootMode(3);
SetDuration(1);
}
}

16
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
View file

@ -386,7 +386,7 @@ public:
return false;
if (!target->IsAlive())
return false;
if (_playerOnly && target->GetTypeId() != TYPEID_PLAYER)
if (_playerOnly && !target->IsPlayer())
return false;
if (_maxDist && _source->GetExactDist(target) > _maxDist)
return false;
@ -412,7 +412,7 @@ public:
return false;
if (!target->IsAlive())
return false;
if (_playerOnly && target->GetTypeId() != TYPEID_PLAYER)
if (_playerOnly && !target->IsPlayer())
return false;
if (target == _source->GetVictim())
return false;
@ -446,7 +446,7 @@ public:
return false;
if (!target->IsAlive())
return false;
if (target->GetTypeId() != TYPEID_PLAYER)
if (!target->IsPlayer())
return false;
if (_source->GetExactDist(target) > 100.0f)
return false;
@ -600,7 +600,7 @@ public:
bool operator()(Unit* unit) const
{
if (!unit || unit->GetTypeId() != TYPEID_PLAYER || unit == _sourceObj || _sourceObj->GetVictim() == unit || !unit->isTargetableForAttack())
if (!unit || !unit->IsPlayer() || unit == _sourceObj || _sourceObj->GetVictim() == unit || !unit->isTargetableForAttack())
return false;
if (unit->HasAura(SPELL_PLAGUE_AVOIDANCE) || unit->HasAura(SPELL_BOSS_HITTIN_YA_AURA) || unit->HasAura(_notAura1) || unit->HasAura(_notAura2))
return false;
@ -2078,7 +2078,7 @@ class spell_the_lich_king_shadow_trap_periodic : public SpellScript
GetCaster()->CastSpell((Unit*)nullptr, SPELL_SHADOW_TRAP_KNOCKBACK, true);
if (Aura* a = GetCaster()->GetAura(SPELL_SHADOW_TRAP_AURA))
a->SetDuration(0);
if (GetCaster()->GetTypeId() == TYPEID_UNIT)
if (GetCaster()->IsCreature())
GetCaster()->ToCreature()->DespawnOrUnsummon(3000);
}
@ -2102,7 +2102,7 @@ class spell_the_lich_king_ice_burst_target_search : public SpellScript
if (unitList.empty())
return;
if (GetCaster()->GetTypeId() == TYPEID_UNIT)
if (GetCaster()->IsCreature())
GetCaster()->ToCreature()->AI()->DoAction(-1);
}
@ -2336,7 +2336,7 @@ class VehicleCheck
public:
bool operator()(WorldObject* unit)
{
return (unit->GetTypeId() != TYPEID_UNIT && unit->GetTypeId() != TYPEID_PLAYER) || unit->ToUnit()->GetVehicle();
return (!unit->IsCreature() && !unit->IsPlayer()) || unit->ToUnit()->GetVehicle();
}
};
@ -2804,7 +2804,7 @@ class spell_the_lich_king_vile_spirit_move_target_search : public SpellScript
bool Load() override
{
_target = nullptr;
return GetCaster()->GetTypeId() == TYPEID_UNIT;
return GetCaster()->IsCreature();
}
void SelectTarget(std::list<WorldObject*>& targets)

4
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
View file

@ -967,7 +967,7 @@ public:
bool CanAIAttack(Unit const* target) const override
{
// do not see targets inside Frostwing Halls when we are not there
return target->GetTypeId() != TYPEID_PLAYER && (me->GetPositionY() > 2660.0f) == (target->GetPositionY() > 2660.0f) && target->GetEntry() != NPC_SINDRAGOSA;
return !target->IsPlayer() && (me->GetPositionY() > 2660.0f) == (target->GetPositionY() > 2660.0f) && target->GetEntry() != NPC_SINDRAGOSA;
}
private:
@ -1757,7 +1757,7 @@ public:
void SpellHitTarget(Unit* c, SpellInfo const* spell) override
{
if (spell->Id == 71306 && c->GetTypeId() == TYPEID_UNIT) // Twisted Winds
if (spell->Id == 71306 && c->IsCreature()) // Twisted Winds
{
Position myPos = me->GetPosition();
me->NearTeleportTo(c->GetPositionX(), c->GetPositionY(), c->GetPositionZ(), c->GetOrientation());

2
src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
View file

@ -146,7 +146,7 @@ public:
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() != TYPEID_PLAYER)
if (!victim->IsPlayer())
return;
Talk(SAY_SLAY);

2
src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
View file

@ -143,7 +143,7 @@ public:
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER)
if (!who->IsPlayer())
return;
if (!urand(0, 3))

2
src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
View file

@ -258,7 +258,7 @@ public:
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER)
if (!who->IsPlayer())
return;
Talk(SAY_SLAY);

2
src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
View file

@ -323,7 +323,7 @@ public:
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER)
if (!who->IsPlayer())
return;
Talk(SAY_KILL);

2
src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
View file

@ -97,7 +97,7 @@ public:
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER)
if (!who->IsPlayer())
return;
Talk(SAY_SLAY);

4
src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
View file

@ -263,7 +263,7 @@ public:
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER)
if (!who->IsPlayer())
return;
Talk(SAY_SLAY);
@ -565,7 +565,7 @@ public:
void MoveInLineOfSight(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER && !who->IsPet())
if (!who->IsPlayer() && !who->IsPet())
return;
ScriptedAI::MoveInLineOfSight(who);

2
src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
View file

@ -206,7 +206,7 @@ public:
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER)
if (!who->IsPlayer())
return;
Talk(SAY_SLAY);

2
src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp
View file

@ -78,7 +78,7 @@ public:
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER)
if (!who->IsPlayer())
return;
if (!urand(0, 3))

2
src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp
View file

@ -222,7 +222,7 @@ public:
void DamageTaken(Unit* who, uint32& damage, DamageEffectType, SpellSchoolMask) override
{
// Damage done by the controlled Death Knight understudies should also count toward damage done by players
if(who && who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_DEATH_KNIGHT_UNDERSTUDY)
if(who && who->IsCreature() && who->GetEntry() == NPC_DEATH_KNIGHT_UNDERSTUDY)
{
me->LowerPlayerDamageReq(damage);
}

6
src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
View file

@ -210,7 +210,7 @@ public:
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER)
if (!who->IsPlayer())
return;
Talk(SAY_SLAY);
@ -490,7 +490,7 @@ public:
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER)
if (!who->IsPlayer())
return;
if (pInstance)
@ -648,7 +648,7 @@ class spell_thaddius_pos_neg_charge : public SpellScript
if (!target)
return;
if (target->HasAura(GetTriggeringSpell()->Id) || target->GetTypeId() != TYPEID_PLAYER)
if (target->HasAura(GetTriggeringSpell()->Id) || !target->IsPlayer())
{
SetHitDamage(0);
}

2
src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
View file

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

4
src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
View file

@ -354,7 +354,7 @@ public:
void IsSummonedBy(WorldObject* summoner) override
{
if (summoner->GetTypeId() != TYPEID_PLAYER)
if (!summoner->IsPlayer())
{
return;
}
@ -392,7 +392,7 @@ public:
void PassengerBoarded(Unit* passenger, int8 /*seatid*/, bool add) override
{
if (passenger->GetTypeId() != TYPEID_PLAYER)
if (!passenger->IsPlayer())
return;
if (add)

2
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
View file

@ -197,7 +197,7 @@ public:
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() != TYPEID_PLAYER)
if (!victim->IsPlayer())
return;
Talk(SAY_SLAY);

2
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
View file

@ -132,7 +132,7 @@ public:
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() != TYPEID_PLAYER)
if (!victim->IsPlayer())
return;
Talk(SAY_SLAY);

2
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
View file

@ -162,7 +162,7 @@ public:
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() != TYPEID_PLAYER)
if (!victim->IsPlayer())
return;
Talk(SAY_SLAY);

2
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
View file

@ -183,7 +183,7 @@ public:
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() != TYPEID_PLAYER)
if (!victim->IsPlayer())
return;
Talk(SAY_SLAY);

4
src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
View file

@ -401,7 +401,7 @@ public:
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() != TYPEID_PLAYER || urand(0, 2))
if (!victim->IsPlayer() || urand(0, 2))
return;
Talk(SAY_ALGALON_KILL);
@ -1018,7 +1018,7 @@ public:
void SpellHit(Unit* caster, SpellInfo const* spell) override
{
if (spell->Id != SPELL_CONSTELLATION_PHASE_EFFECT || caster->GetTypeId() != TYPEID_UNIT)
if (spell->Id != SPELL_CONSTELLATION_PHASE_EFFECT || !caster->IsCreature())
return;
if (InstanceScript* instance = me->GetInstanceScript())

6
src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
View file

@ -310,7 +310,7 @@ public:
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER)
if (!who->IsPlayer())
return;
if (_phase == 3)
@ -488,7 +488,7 @@ public:
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER)
if (!who->IsPlayer())
return;
Talk(SAY_MOLGEIM_SLAY);
@ -706,7 +706,7 @@ public:
void KilledUnit(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER || urand(0, 2))
if (!who->IsPlayer() || urand(0, 2))
return;
Talk(SAY_BRUNDIR_SLAY);

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
View file

@ -194,7 +194,7 @@ public:
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() != TYPEID_PLAYER || urand(0, 2))
if (!victim->IsPlayer() || urand(0, 2))
return;
Talk(SAY_SLAY);

14
src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
View file

@ -447,7 +447,7 @@ public:
case EVENT_REINSTALL:
for (uint8 i = RAID_MODE(0, 2); i < 4; ++i)
if (Unit* seat = vehicle->GetPassenger(i))
if (seat->GetTypeId() == TYPEID_UNIT)
if (seat->IsCreature())
seat->ToCreature()->AI()->EnterEvadeMode();
Talk(FLAME_LEVIATHAN_EMOTE_REACTIVATE);
return;
@ -758,7 +758,7 @@ public:
void PassengerBoarded(Unit* who, int8 seatId, bool apply) override
{
if (who->GetTypeId() != TYPEID_PLAYER || !me->GetVehicle())
if (!who->IsPlayer() || !me->GetVehicle())
return;
who->ApplySpellImmune(63847, IMMUNITY_ID, 63847, apply); // SPELL_FLAME_VENTS_TRIGGER
@ -780,7 +780,7 @@ public:
{
turret->ReplaceAllUnitFlags(UNIT_FLAG_NOT_SELECTABLE);
turret->SetImmuneToAll(true);
if (turret->GetTypeId() == TYPEID_UNIT)
if (turret->IsCreature())
turret->ToCreature()->AI()->EnterEvadeMode();
}
}
@ -829,7 +829,7 @@ public:
bool CanAIAttack(Unit const* who) const override
{
if (!who || who->GetTypeId() != TYPEID_PLAYER || !who->GetVehicle() || who->GetVehicleBase()->GetEntry() != NPC_SEAT)
if (!who || !who->IsPlayer() || !who->GetVehicle() || who->GetVehicleBase()->GetEntry() != NPC_SEAT)
return false;
return true;
}
@ -1231,7 +1231,7 @@ public:
{
if (!_lock)
{
if (who->GetTypeId() != TYPEID_PLAYER && !who->IsVehicle())
if (!who->IsPlayer() && !who->IsVehicle())
return;
// MIMIRON
@ -1753,7 +1753,7 @@ class spell_vehicle_grab_pyrite : public SpellScript
GetCaster()->CastSpell(parent, SPELL_ADD_PYRITE, true);
target->CastSpell(seat, GetEffectValue());
if (target->GetTypeId() == TYPEID_UNIT)
if (target->IsCreature())
target->ToCreature()->DespawnOrUnsummon(1300);
}
}
@ -1927,7 +1927,7 @@ class spell_demolisher_ride_vehicle : public SpellScript
SpellCastResult CheckCast()
{
if (GetCaster()->GetTypeId() != TYPEID_PLAYER)
if (!GetCaster()->IsPlayer())
return SPELL_CAST_OK;
Unit* target = this->GetExplTargetUnit();

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
View file

@ -307,7 +307,7 @@ public:
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() != TYPEID_PLAYER || urand(0, 2))
if (!victim->IsPlayer() || urand(0, 2))
return;
Talk(SAY_SLAY);

6
src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
View file

@ -486,7 +486,7 @@ class spell_aura_of_despair_aura : public AuraScript
if (Unit* caster = GetCaster())
if (Unit* target = GetTarget())
{
if (target->GetTypeId() != TYPEID_PLAYER)
if (!target->IsPlayer())
return;
target->CastSpell(target, SPELL_AURA_OF_DESPAIR_2, true);
@ -614,7 +614,7 @@ public:
bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
{
return target && target->GetEntry() == NPC_VEZAX && target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->AI()->GetData(1);
return target && target->GetEntry() == NPC_VEZAX && target->IsCreature() && target->ToCreature()->AI()->GetData(1);
}
};
@ -625,7 +625,7 @@ public:
bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
{
return target && target->GetEntry() == NPC_VEZAX && target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->AI()->GetData(2);
return target && target->GetEntry() == NPC_VEZAX && target->IsCreature() && target->ToCreature()->AI()->GetData(2);
}
};

18
src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
View file

@ -578,7 +578,7 @@ public:
{
if (t->IsPlayer())
return !t->HasAura(SPELL_FLASH_FREEZE_TRAPPED_PLAYER);
else if (t->GetTypeId() == TYPEID_UNIT)
else if (t->IsCreature())
return !t->HasAura(SPELL_FLASH_FREEZE_TRAPPED_NPC);
return true;
@ -702,7 +702,7 @@ public:
{
if (Unit* s = me->ToTempSummon()->GetSummonerUnit())
{
if ((s->IsPlayer() && !s->HasAura(SPELL_FLASH_FREEZE_TRAPPED_PLAYER)) || (s->GetTypeId() == TYPEID_UNIT && !s->HasAura(SPELL_FLASH_FREEZE_TRAPPED_NPC)))
if ((s->IsPlayer() && !s->HasAura(SPELL_FLASH_FREEZE_TRAPPED_PLAYER)) || (s->IsCreature() && !s->HasAura(SPELL_FLASH_FREEZE_TRAPPED_NPC)))
me->DespawnOrUnsummon(2000);
else if (s->IsPlayer())
if (InstanceScript* instanceScript = me->GetInstanceScript())
@ -1354,14 +1354,14 @@ class spell_hodir_flash_freeze_aura : public AuraScript
{
Unit* target = GetTarget();
Unit* caster = GetCaster();
if (!target || !caster || caster->GetTypeId() != TYPEID_UNIT)
if (!target || !caster || !caster->IsCreature())
return;
if (Aura* aur = target->GetAura(target->IsPlayer() ? SPELL_FLASH_FREEZE_TRAPPED_PLAYER : SPELL_FLASH_FREEZE_TRAPPED_NPC))
{
if (Unit* caster2 = aur->GetCaster())
{
if (caster2->GetTypeId() == TYPEID_UNIT)
if (caster2->IsCreature())
{
caster2->ToCreature()->DespawnOrUnsummon();
}
@ -1378,7 +1378,7 @@ class spell_hodir_flash_freeze_aura : public AuraScript
caster->ToCreature()->AI()->JustSummoned(c);
}
}
else if (target->GetTypeId() == TYPEID_UNIT)
else if (target->IsCreature())
{
if( Creature* c = target->SummonCreature(NPC_FLASH_FREEZE_NPC, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 2000) )
{
@ -1483,7 +1483,7 @@ public:
bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
{
return target && target->GetEntry() == NPC_HODIR && target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->AI()->GetData(1);
return target && target->GetEntry() == NPC_HODIR && target->IsCreature() && target->ToCreature()->AI()->GetData(1);
}
};
@ -1494,7 +1494,7 @@ public:
bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
{
return target && target->GetEntry() == NPC_HODIR && target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->AI()->GetData(2);
return target && target->GetEntry() == NPC_HODIR && target->IsCreature() && target->ToCreature()->AI()->GetData(2);
}
};
@ -1505,7 +1505,7 @@ public:
bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
{
return target && target->GetEntry() == NPC_HODIR && target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->AI()->GetData(3);
return target && target->GetEntry() == NPC_HODIR && target->IsCreature() && target->ToCreature()->AI()->GetData(3);
}
};
@ -1516,7 +1516,7 @@ public:
bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
{
return target && target->GetEntry() == NPC_HODIR && target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->AI()->GetData(4);
return target && target->GetEntry() == NPC_HODIR && target->IsCreature() && target->ToCreature()->AI()->GetData(4);
}
};

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
View file

@ -542,7 +542,7 @@ public:
bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
{
if (!target || target->GetTypeId() != TYPEID_UNIT)
if (!target || !target->IsCreature())
return false;
return !!target->ToCreature()->AI()->GetData(1337);
}

4
src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
View file

@ -707,7 +707,7 @@ public:
if (target == _victim && _me->GetThreatMgr().GetThreatListSize() > 1)
return true;
if (target->GetTypeId() != TYPEID_PLAYER)
if (!target->IsPlayer())
return true;
return false;
@ -724,7 +724,7 @@ class spell_ulduar_stone_grip_cast_target : public SpellScript
bool Load() override
{
if (GetCaster()->GetTypeId() != TYPEID_UNIT)
if (!GetCaster()->IsCreature())
return false;
return true;
}

14
src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
View file

@ -1342,7 +1342,7 @@ public:
if( Vehicle* vk = me->GetVehicleKit() )
for (uint8 i = 0; i < 2; ++i)
if (Unit* r = vk->GetPassenger(5 + i))
if (r->GetTypeId() == TYPEID_UNIT)
if (r->IsCreature())
r->ToCreature()->DespawnOrUnsummon(1);
}
@ -1438,7 +1438,7 @@ public:
exitPos.m_positionZ += 2.0f * Phase;
r->_ExitVehicle(&exitPos);
me->RemoveAurasByType(SPELL_AURA_CONTROL_VEHICLE, r->GetGUID());
if (r->GetTypeId() == TYPEID_UNIT)
if (r->IsCreature())
r->ToCreature()->AI()->SetData(0, 0);
}
}
@ -2155,7 +2155,7 @@ class spell_mimiron_p3wx2_laser_barrage_aura : public AuraScript
{
if (Unit* caster = GetCaster())
{
if (caster->GetTypeId() != TYPEID_UNIT)
if (!caster->IsCreature())
return;
uint32 diff = getMSTimeDiff(_lastMSTime, GameTime::GetGameTimeMS().count());
if (_lastOrientation == -1.0f)
@ -2466,7 +2466,7 @@ public:
bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
{
return target && target->GetEntry() == NPC_MIMIRON && target->GetTypeId() == TYPEID_UNIT && target->ToCreature()->AI()->GetData(1);
return target && target->GetEntry() == NPC_MIMIRON && target->IsCreature() && target->ToCreature()->AI()->GetData(1);
}
};
@ -2477,7 +2477,7 @@ public:
bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
{
return target && target->GetEntry() == NPC_MIMIRON && target->GetTypeId() == TYPEID_UNIT && !target->ToCreature()->AI()->GetData(11);
return target && target->GetEntry() == NPC_MIMIRON && target->IsCreature() && !target->ToCreature()->AI()->GetData(11);
}
};
@ -2488,7 +2488,7 @@ public:
bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
{
return target && target->GetEntry() == NPC_MIMIRON && target->GetTypeId() == TYPEID_UNIT && !target->ToCreature()->AI()->GetData(12);
return target && target->GetEntry() == NPC_MIMIRON && target->IsCreature() && !target->ToCreature()->AI()->GetData(12);
}
};
@ -2499,7 +2499,7 @@ public:
bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
{
return target && target->GetEntry() == NPC_MIMIRON && target->GetTypeId() == TYPEID_UNIT && !target->ToCreature()->AI()->GetData(13);
return target && target->GetEntry() == NPC_MIMIRON && target->IsCreature() && !target->ToCreature()->AI()->GetData(13);
}
};

4
src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
View file

@ -711,7 +711,7 @@ public:
if (_introSpoken)
return;
if (who->GetTypeId() != TYPEID_PLAYER || me->GetExactDist2d(who) > 15.0f)
if (!who->IsPlayer() || me->GetExactDist2d(who) > 15.0f)
return;
_introSpoken = true;
@ -1153,7 +1153,7 @@ public:
bool OnCheck(Player* /*player*/, Unit* target, uint32 /*criteria_id*/) override
{
return target && target->GetTypeId() == TYPEID_UNIT && target->GetEntry() == NPC_RAZORSCALE && target->ToCreature()->AI()->GetData(1);
return target && target->IsCreature() && target->GetEntry() == NPC_RAZORSCALE && target->ToCreature()->AI()->GetData(1);
}
};

2
src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
View file

@ -427,7 +427,7 @@ public:
{
summons.Summon(cr);
if (Unit* owner = me->GetVehicleBase())
if (owner->GetTypeId() == TYPEID_UNIT)
if (owner->IsCreature())
owner->ToCreature()->AI()->JustSummoned(cr);
}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override

2
src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
View file

@ -1103,7 +1103,7 @@ public:
if (Creature* algalon = instance->GetCreature(m_uiAlgalonGUID))
algalon->AI()->DoAction(ACTION_FEEDS_ON_TEARS_FAILED);
}
else if (unit->GetTypeId() == TYPEID_UNIT && unit->GetAreaId() == 4656 /*Conservatory of Life*/)
else if (unit->IsCreature() && unit->GetAreaId() == 4656 /*Conservatory of Life*/)
{
if (GameTime::GetGameTime().count() > (m_conspeedatoryAttempt + DAY))
{

2
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
View file

@ -328,7 +328,7 @@ public:
void KilledUnit(Unit* victim) override
{
if (victim->GetTypeId() != TYPEID_PLAYER)
if (!victim->IsPlayer())
return;
Talk(SAY_SLAY);

2
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
View file

@ -404,7 +404,7 @@ class spell_svala_ritual_strike : public SpellScript
{
if (Unit* unitTarget = GetHitUnit())
{
if (unitTarget->GetTypeId() != TYPEID_UNIT)
if (!unitTarget->IsCreature())
return;
Unit::DealDamage(GetCaster(), unitTarget, 7000, nullptr, DIRECT_DAMAGE);

2
src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp
View file

@ -217,7 +217,7 @@ public:
void HandlePeriodicDummy(AuraEffect const* /*aurEff*/)
{
Unit* target = GetTarget();
if (target->GetTypeId() == TYPEID_UNIT && GetAura()->GetStackAmount() >= 10)
if (target->IsCreature() && GetAura()->GetStackAmount() >= 10)
{
target->CastSpell(target, SPELL_OVERCHARGED_BLAST, true);
Unit::Kill(target, target, false);

6
src/server/scripts/Northrend/zone_borean_tundra.cpp
View file

@ -45,7 +45,7 @@ class spell_q11919_q11940_drake_hunt_aura : public AuraScript
bool Load() override
{
return GetOwner()->GetTypeId() == TYPEID_UNIT;
return GetOwner()->IsCreature();
}
void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
@ -217,7 +217,7 @@ public:
{
ScriptedAI::MoveInLineOfSight(who);
if (who->GetTypeId() != TYPEID_UNIT)
if (!who->IsCreature())
return;
if (who->GetEntry() == NPC_ORPHANED_MAMMOTH_CALF && me->IsWithinDistInMap(who, 10.0f))
@ -314,7 +314,7 @@ public:
void JustDied(Unit* killer) override
{
if (!killer || killer->GetTypeId() != TYPEID_PLAYER)
if (!killer || !killer->IsPlayer())
{
return;
}

12
src/server/scripts/Northrend/zone_dragonblight.cpp
View file

@ -694,7 +694,7 @@ public:
if (Vehicle* gryphon = me->GetVehicleKit())
if (Unit* villager = gryphon->GetPassenger(1))
{
if (villager->GetTypeId() != TYPEID_UNIT)
if (!villager->IsCreature())
return;
if (Creature* seat = villager->ToCreature())
@ -1296,7 +1296,7 @@ public:
if (Unit* vb = c->GetVehicleBase())
{
if (Unit* pass = vb->GetVehicleKit()->GetPassenger(0))
if (pass->GetTypeId() == TYPEID_UNIT)
if (pass->IsCreature())
pass->ToCreature()->DespawnOrUnsummon(1);
vb->RemoveAllAuras();
vb->ToCreature()->DespawnOrUnsummon(1);
@ -1323,7 +1323,7 @@ public:
void SpellHitTarget(Unit* target, SpellInfo const* spell) override
{
if (spell->Id == SPELL_SAC_REPEL_HAMMER && target->GetTypeId() == TYPEID_UNIT)
if (spell->Id == SPELL_SAC_REPEL_HAMMER && target->IsCreature())
{
target->CastSpell((Unit*)nullptr, SPELL_SAC_THROW_HAMMER, true);
target->ToCreature()->DespawnOrUnsummon(1);
@ -1469,7 +1469,7 @@ public:
explicit GhoulTargetCheck(bool alive) : _alive(alive) {}
bool operator()(WorldObject* object) const
{
return _alive ^ (object->GetTypeId() != TYPEID_UNIT || ((Unit*)object)->GetDisplayId() != 11686);
return _alive ^ (!object->IsCreature() || ((Unit*)object)->GetDisplayId() != 11686);
}
private:
bool _alive;
@ -1489,7 +1489,7 @@ class spell_q24545_aod_special : public SpellScript
{
PreventHitDefaultEffect(effIndex);
if (Unit* target = GetHitUnit())
if (target->GetTypeId() == TYPEID_UNIT)
if (target->IsCreature())
target->ToCreature()->AI()->DoAction(GetSpellInfo()->Id == 70790 ? -2 : -1);
}
@ -1648,7 +1648,7 @@ public:
void IsSummonedBy(WorldObject* summoner) override
{
if (!summoner || summoner->GetTypeId() != TYPEID_PLAYER)
if (!summoner || !summoner->IsPlayer())
return;
uint8 id = GetSpeachId();

2
src/server/scripts/Northrend/zone_grizzly_hills.cpp
View file

@ -967,7 +967,7 @@ class spell_shredder_delivery : public SpellScript
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_UNIT;
return GetCaster()->IsCreature();
}
void HandleScript(SpellEffIndex /*effIndex*/)

2
src/server/scripts/Northrend/zone_howling_fjord.cpp
View file

@ -139,7 +139,7 @@ public:
void setphase(short newPhase)
{
Unit* summoner = me->ToTempSummon() ? me->ToTempSummon()->GetSummonerUnit() : nullptr;
if (!summoner || summoner->GetTypeId() != TYPEID_PLAYER)
if (!summoner || !summoner->IsPlayer())
return;
switch (newPhase)

6
src/server/scripts/Northrend/zone_icecrown.cpp
View file

@ -51,7 +51,7 @@ public:
void MoveInLineOfSight(Unit* who) override
{
if (who->GetTypeId() != TYPEID_PLAYER || me->GetDistance(who) > 8.0f || who->ToPlayer()->GetQuestStatus(QUEST_BLACK_KNIGHT_CURSE) != QUEST_STATUS_INCOMPLETE)
if (!who->IsPlayer() || me->GetDistance(who) > 8.0f || who->ToPlayer()->GetQuestStatus(QUEST_BLACK_KNIGHT_CURSE) != QUEST_STATUS_INCOMPLETE)
return;
if (me->FindNearestCreature(NPC_CULT_ASSASSIN, 30.0f))
@ -1248,7 +1248,7 @@ public:
if (!summoner)
return;
if (summoner->GetTypeId() != TYPEID_PLAYER)
if (!summoner->IsPlayer())
return;
Player* player = summoner->ToPlayer();
@ -1493,7 +1493,7 @@ public:
if (me->GetAreaId() != AREA_SUNREAVER_PAVILION && me->GetAreaId() != AREA_SILVER_COVENANT_PAVILION)
return;
if (!who || who->GetTypeId() != TYPEID_PLAYER || !me->IsHostileTo(who) || !me->isInBackInMap(who, 5.0f))
if (!who || !who->IsPlayer() || !me->IsHostileTo(who) || !me->isInBackInMap(who, 5.0f))
return;
if (who->HasAura(SPELL_TRESPASSER_H) || who->HasAura(SPELL_TRESPASSER_A))

2
src/server/scripts/Northrend/zone_storm_peaks.cpp
View file

@ -875,7 +875,7 @@ public:
for (uint8 i = 1; i < 4; ++i)
if (Unit* prisoner = me->GetVehicleKit()->GetPassenger(i))
{
if (prisoner->GetTypeId() != TYPEID_UNIT)
if (!prisoner->IsCreature())
return;
prisoner->CastSpell(player, SPELL_KILL_CREDIT_PRISONER, true);
prisoner->CastSpell(prisoner, SPELL_SUMMON_LIBERATED, true);

2
src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp
View file

@ -322,7 +322,7 @@ void OPvPCapturePointHP::HandlePlayerLeave(Player* player)
void OutdoorPvPHP::HandleKillImpl(Player* player, Unit* killed)
{
if (killed->GetTypeId() != TYPEID_PLAYER)
if (!killed->IsPlayer())
return;
if (player->GetTeamId() == TEAM_ALLIANCE && killed->ToPlayer()->GetTeamId() != TEAM_ALLIANCE)

4
src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
View file

@ -56,7 +56,7 @@ void OutdoorPvPNA::HandleKill(Player* killer, Unit* killed)
// creature kills must be notified, even if not inside objective / not outdoor pvp active
// player kills only count if active and inside objective
if ((groupGuy->IsOutdoorPvPActive() && groupGuy->GetAreaId() == NA_HALAA_ZONE_ID) || killed->GetTypeId() == TYPEID_UNIT)
if ((groupGuy->IsOutdoorPvPActive() && groupGuy->GetAreaId() == NA_HALAA_ZONE_ID) || killed->IsCreature())
{
HandleKillImpl(groupGuy, killed);
}
@ -65,7 +65,7 @@ void OutdoorPvPNA::HandleKill(Player* killer, Unit* killed)
else
{
// creature kills must be notified, even if not inside objective / not outdoor pvp active
if (killer && ((killer->IsOutdoorPvPActive() && killer->ToPlayer()->GetAreaId() == NA_HALAA_ZONE_ID) || killed->GetTypeId() == TYPEID_UNIT))
if (killer && ((killer->IsOutdoorPvPActive() && killer->ToPlayer()->GetAreaId() == NA_HALAA_ZONE_ID) || killed->IsCreature()))
{
HandleKillImpl(killer, killed);
}

2
src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
View file

@ -199,7 +199,7 @@ bool OutdoorPvPZM::SetupOutdoorPvP()
void OutdoorPvPZM::HandleKillImpl(Player* player, Unit* killed)
{
if (killed->GetTypeId() != TYPEID_PLAYER)
if (!killed->IsPlayer())
return;
if (player->GetTeamId() == TEAM_ALLIANCE && killed->ToPlayer()->GetTeamId() != TEAM_ALLIANCE)

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)

Some files were not shown because too many files have changed in this diff Show more