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

(cherry picked from commit 034561792ca9a07d719961ea842af2118428816f)

7 files changed, 35 insertions, 13 deletions

diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
index af90f1defc3..046d315a50f 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
@@ -265,7 +265,7 @@ struct boss_prince_taldaram : public BossAI
 
     Unit* GetEmbraceTarget()
     {
-        if (_embraceTargetGUID)
+        if (!_embraceTargetGUID.IsEmpty())
             return ObjectAccessor::GetUnit(*me, _embraceTargetGUID);
 
         return nullptr;
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
index acdb2578d26..88234f4a7fe 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
@@ -215,7 +215,10 @@ private:
     void SetSummonerStatus(bool active)
     {
         for (uint8 i = 0; i < 4; i++)
-            if (ObjectGuid guid = instance->GetGuidData(summoners[i].data))
+        {
+            ObjectGuid guid = instance->GetGuidData(summoners[i].data);
+            if (!guid.IsEmpty())
+            {
                 if (Creature* crystalChannelTarget = ObjectAccessor::GetCreature(*me, guid))
                 {
                     if (active)
@@ -223,14 +226,19 @@ private:
                     else
                         crystalChannelTarget->AI()->Reset();
                 }
+            }
+        }
     }
 
     void SetCrystalsStatus(bool active)
     {
         for (uint8 i = 0; i < 4; i++)
-            if (ObjectGuid guid = instance->GetGuidData(DATA_NOVOS_CRYSTAL_1 + i))
+        {
+            ObjectGuid guid = instance->GetGuidData(DATA_NOVOS_CRYSTAL_1 + i);
+            if (!guid.IsEmpty())
                 if (GameObject* crystal = ObjectAccessor::GetGameObject(*me, guid))
                     SetCrystalStatus(crystal, active);
+        }
     }
 
     void SetCrystalStatus(GameObject* crystal, bool active)
@@ -248,13 +256,20 @@ private:
     void CrystalHandlerDied()
     {
         for (uint8 i = 0; i < 4; i++)
-            if (ObjectGuid guid = instance->GetGuidData(DATA_NOVOS_CRYSTAL_1 + i))
+        {
+            ObjectGuid guid = instance->GetGuidData(DATA_NOVOS_CRYSTAL_1 + i);
+            if (!guid.IsEmpty())
+            {
                 if (GameObject* crystal = ObjectAccessor::GetGameObject(*me, guid))
+                {
                     if (crystal->GetGoState() == GO_STATE_ACTIVE)
                     {
                         SetCrystalStatus(crystal, false);
                         break;
                     }
+                }
+            }
+        }
 
         if (++_crystalHandlerCount >= 4)
         {
@@ -265,9 +280,13 @@ private:
             if (IsHeroic())
                 events.ScheduleEvent(EVENT_SUMMON_MINIONS, 15s);
         }
-        else if (ObjectGuid guid = instance->GetGuidData(DATA_NOVOS_SUMMONER_4))
-            if (Creature* crystalChannelTarget = ObjectAccessor::GetCreature(*me, guid))
-                crystalChannelTarget->AI()->SetData(SPELL_SUMMON_CRYSTAL_HANDLER, 15000);
+        else
+        {
+            ObjectGuid guid = instance->GetGuidData(DATA_NOVOS_SUMMONER_4);
+            if (!guid.IsEmpty())
+                if (Creature* crystalChannelTarget = ObjectAccessor::GetCreature(*me, guid))
+                    crystalChannelTarget->AI()->SetData(SPELL_SUMMON_CRYSTAL_HANDLER, 15000);
+        }
     }
 
     uint8 _crystalHandlerCount;
@@ -319,9 +338,12 @@ struct npc_crystal_channel_target : public ScriptedAI
     void JustSummoned(Creature* summon) override
     {
         if (InstanceScript* instance = me->GetInstanceScript())
-            if (ObjectGuid guid = instance->GetGuidData(DATA_NOVOS))
+        {
+            ObjectGuid guid = instance->GetGuidData(DATA_NOVOS);
+            if (!guid.IsEmpty())
                 if (Creature* novos = ObjectAccessor::GetCreature(*me, guid))
                     novos->AI()->JustSummoned(summon);
+        }
 
         if (summon)
             summon->GetMotionMaster()->MovePath(summon->GetEntry() * 100, false);
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
index 6d2b7a36979..465ea267821 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
@@ -379,7 +379,7 @@ class instance_halls_of_reflection : public InstanceMapScript
             void SpawnGunship()
             {
                 // don't spawn gunship twice
-                if (GunshipGUID)
+                if (!GunshipGUID.IsEmpty())
                     return;
 
                 if (!_teamInInstance)
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
index 8baa374226e..27db7256eb9 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
@@ -411,7 +411,7 @@ public:
             if (_respawnCooldowns[i] > now)
                 continue;
 
-            if (_controlledSlots[i])
+            if (!_controlledSlots[i].IsEmpty())
             {
                 Creature* current = ObjectAccessor::GetCreature(*_transport, _controlledSlots[i]);
                 if (current && current->IsAlive())
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
index 411319c7452..73f1d16db99 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
@@ -142,7 +142,7 @@ struct boss_anomalus : public ScriptedAI
 
         if (me->HasAura(SPELL_RIFT_SHIELD))
         {
-            if (uiChaoticRiftGUID)
+            if (!uiChaoticRiftGUID.IsEmpty())
             {
                 Creature* Rift = ObjectAccessor::GetCreature(*me, uiChaoticRiftGUID);
                 if (Rift && Rift->isDead())
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
index b9ead2ee63e..59fce6827e3 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
@@ -231,7 +231,7 @@ class boss_kologarn : public CreatureScript
                 summon->SetReactState(REACT_PASSIVE);
 
                 // Victim gets 67351
-                if (eyebeamTarget)
+                if (!eyebeamTarget.IsEmpty())
                 {
                     if (Unit* target = ObjectAccessor::GetUnit(*summon, eyebeamTarget))
                     {
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
index a09ff4c3684..6e076395241 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
@@ -284,7 +284,7 @@ struct boss_ymiron : public BossAI
     void DespawnBoatGhosts(ObjectGuid& CreatureGUID)
     {
         // @todo: fire visual after ancestor despawns.
-        if (CreatureGUID)
+        if (!CreatureGUID.IsEmpty())
             if (Creature* temp = ObjectAccessor::GetCreature(*me, CreatureGUID))
                 temp->DisappearAndDie();