Core/Entities: Final batch of removing implicit conversions of ObjectGuid to uint64

(cherry picked from commit 68f45e87345ff85341f835f0372f2a62b89f24d9)

5 files changed, 16 insertions, 17 deletions

diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
index 95d59c34b71..d02a9518e6d 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
@@ -554,7 +554,7 @@ struct npc_halion_controller : public ScriptedAI
 
     void JustAppeared() override
     {
-        if (_instance->GetGuidData(DATA_HALION) || _instance->GetBossState(DATA_GENERAL_ZARITHRIAN) != DONE)
+        if (!_instance->GetGuidData(DATA_HALION).IsEmpty() || _instance->GetBossState(DATA_GENERAL_ZARITHRIAN) != DONE)
             return;
 
         Reset();
@@ -625,7 +625,7 @@ struct npc_halion_controller : public ScriptedAI
                 _events.ScheduleEvent(EVENT_START_INTRO, 2s);
                 break;
             case ACTION_INTRO_HALION_2:
-                if (_instance->GetGuidData(DATA_HALION))
+                if (!_instance->GetGuidData(DATA_HALION).IsEmpty())
                     return;
 
                 for (uint8 i = DATA_BURNING_TREE_1; i <= DATA_BURNING_TREE_4; ++i)
@@ -702,7 +702,7 @@ struct npc_halion_controller : public ScriptedAI
                     break;
                 case EVENT_INTRO_PROGRESS_3:
                     DoCastSelf(SPELL_FIERY_EXPLOSION);
-                    if (_instance->GetGuidData(DATA_HALION))
+                    if (!_instance->GetGuidData(DATA_HALION).IsEmpty())
                         return;
                     if (Creature* halion = me->GetMap()->SummonCreature(NPC_HALION, HalionSpawnPos))
                         halion->AI()->Talk(SAY_INTRO);
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
index fff21635599..4dc78656d2a 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
@@ -188,13 +188,12 @@ struct boss_anubrekhan : public BossAI
                 case EVENT_SCARABS:
                     if (!guardCorpses.empty())
                     {
-                        if (ObjectGuid target = Trinity::Containers::SelectRandomContainerElement(guardCorpses))
-                            if (Creature* creatureTarget = ObjectAccessor::GetCreature(*me, target))
-                            {
-                                creatureTarget->CastSpell(creatureTarget, SPELL_SUMMON_CORPSE_SCARABS_MOB, me->GetGUID());
-                                creatureTarget->AI()->Talk(EMOTE_SCARAB);
-                                creatureTarget->DespawnOrUnsummon();
-                            }
+                        if (Creature* creatureTarget = ObjectAccessor::GetCreature(*me, Trinity::Containers::SelectRandomContainerElement(guardCorpses)))
+                        {
+                            creatureTarget->CastSpell(creatureTarget, SPELL_SUMMON_CORPSE_SCARABS_MOB, me->GetGUID());
+                            creatureTarget->AI()->Talk(EMOTE_SCARAB);
+                            creatureTarget->DespawnOrUnsummon();
+                        }
                     }
                     events.Repeat(randtime(Seconds(40), Seconds(60)));
                     break;
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
index 9116e778146..bd16dacd912 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
@@ -529,7 +529,7 @@ class spell_sapphiron_icebolt : public AuraScript
 
     void HandleRemove(AuraEffect const* /*eff*/, AuraEffectHandleModes /*mode*/)
     {
-        if (_block)
+        if (!_block.IsEmpty())
             if (GameObject* oBlock = ObjectAccessor::GetGameObject(*GetTarget(), _block))
                 oBlock->Delete();
         GetTarget()->ApplySpellImmune(SPELL_ICEBOLT, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_FROST, false);
@@ -537,7 +537,7 @@ class spell_sapphiron_icebolt : public AuraScript
 
     void HandlePeriodic(AuraEffect const* /*eff*/)
     {
-        if (_block)
+        if (!_block.IsEmpty())
             return;
         if (GetTarget()->isMoving())
             return;
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
index 8dd494f7855..3de86ec397b 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
@@ -648,7 +648,7 @@ private:
     Creature* myCoil()
     {
         Creature* coil = nullptr;
-        if (_myCoil)
+        if (!_myCoil.IsEmpty())
             coil = ObjectAccessor::GetCreature(*me, _myCoil);
         if (!coil)
         {
@@ -665,7 +665,7 @@ private:
     GameObject* myCoilGO()
     {
         GameObject* coil = nullptr;
-        if (_myCoilGO)
+        if (!_myCoilGO.IsEmpty())
             coil = ObjectAccessor::GetGameObject(*me, _myCoilGO);
         if (!coil)
         {
@@ -889,7 +889,7 @@ private:
     Creature* myCoil()
     {
         Creature* coil = nullptr;
-        if (_myCoil)
+        if (!_myCoil.IsEmpty())
             coil = ObjectAccessor::GetCreature(*me, _myCoil);
         if (!coil)
         {
@@ -906,7 +906,7 @@ private:
     GameObject* myCoilGO()
     {
         GameObject* coil = nullptr;
-        if (_myCoilGO)
+        if (!_myCoilGO.IsEmpty())
             coil = ObjectAccessor::GetGameObject(*me, _myCoilGO);
         if (!coil)
         {
diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp
index 9bcc0f7733c..f3f65476cab 100644
--- a/src/server/scripts/Northrend/zone_storm_peaks.cpp
+++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp
@@ -575,7 +575,7 @@ struct npc_wild_wyrm : public VehicleAI
 
     void SpellHit(WorldObject* caster, SpellInfo const* spellInfo) override
     {
-        if (_playerGuid || spellInfo->Id != SPELL_SPEAR_OF_HODIR)
+        if (!_playerGuid.IsEmpty() || spellInfo->Id != SPELL_SPEAR_OF_HODIR)
             return;
 
         _playerGuid = caster->GetGUID();