diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-21 21:09:15 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2025-09-28 23:29:04 +0200 |
| commit | 7eab6a791ae1c039de67a80ff8bd125bf69f7ba4 (patch) | |
| tree | 33fdc30d2a282d93ff0fbd1612228c394adfa6a0 /src/server/scripts/Outland | |
| parent | 75f036976410811d3c2629ddcddd279beb2dafb8 (diff) | |
Core/Entities: Final batch of removing implicit conversions of ObjectGuid to uint64
(cherry picked from commit 68f45e87345ff85341f835f0372f2a62b89f24d9)
Diffstat (limited to 'src/server/scripts/Outland')
| -rw-r--r-- | src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index 0d6b6dd2eca..d1940d4cdc6 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -136,7 +136,7 @@ struct boss_fathomlord_karathress : public BossAI // Respawn advisors for (uint8 i = 0; i < MAX_ADVISORS; ++i) - if (_advisors[i]) + if (!_advisors[i].IsEmpty()) { Creature* advisor = ObjectAccessor::GetCreature(*me, _advisors[i]); if (advisor && !advisor->IsAlive()) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 82a2d2616f2..f81d07193f5 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -696,7 +696,7 @@ struct npc_greyheart_spellbinder : public ScriptedAI { if (!me->IsInCombat() && !me->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) { - if (leotherasGUID) + if (!leotherasGUID.IsEmpty()) { Creature* leotheras = ObjectAccessor::GetCreature(*me, leotherasGUID); if (leotheras && leotheras->IsAlive()) @@ -710,7 +710,7 @@ struct npc_greyheart_spellbinder : public ScriptedAI if (!leotherasGUID) leotherasGUID = instance->GetGuidData(DATA_LEOTHERAS); - if (!me->IsInCombat() && instance->GetGuidData(DATA_LEOTHERAS_EVENT_STARTER)) + if (!me->IsInCombat() && !instance->GetGuidData(DATA_LEOTHERAS_EVENT_STARTER).IsEmpty()) { if (Unit* victim = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_LEOTHERAS_EVENT_STARTER))) AttackStart(victim); |