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

(cherry picked from commit 034561792ca9a07d719961ea842af2118428816f)

17 files changed, 62 insertions, 40 deletions

diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
index 2e6314c1748..96c6a4e4ee6 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
@@ -270,7 +270,7 @@ public:
 
         void JustDied(Unit* /*killer*/) override
         {
-            if (DorotheeGUID)
+            if (!DorotheeGUID.IsEmpty())
             {
                 Creature* Dorothee = (ObjectAccessor::GetCreature((*me), DorotheeGUID));
                 if (Dorothee && Dorothee->IsAlive())
@@ -1278,7 +1278,7 @@ public:
         void JustEngagedWith(Unit* /*who*/) override
         {
             Talk(SAY_ROMULO_AGGRO);
-            if (JulianneGUID)
+            if (!JulianneGUID.IsEmpty())
             {
                 Creature* Julianne = (ObjectAccessor::GetCreature((*me), JulianneGUID));
                 if (Julianne && Julianne->GetVictim())
diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp
index c283c3bd40e..8ad3f2e85ee 100644
--- a/src/server/scripts/Events/childrens_week.cpp
+++ b/src/server/scripts/Events/childrens_week.cpp
@@ -179,7 +179,7 @@ class npc_winterfin_playmate : public CreatureScript
                         {
                             playerGUID = player->GetGUID();
                             orphanGUID = getOrphanGUID(player, ORPHAN_ORACLE);
-                            if (orphanGUID)
+                            if (!orphanGUID.IsEmpty())
                                 phase = 1;
                         }
             }
@@ -286,7 +286,7 @@ class npc_snowfall_glade_playmate : public CreatureScript
                         {
                             playerGUID = player->GetGUID();
                             orphanGUID = getOrphanGUID(player, ORPHAN_WOLVAR);
-                            if (orphanGUID)
+                            if (!orphanGUID.IsEmpty())
                                 phase = 1;
                         }
             }
@@ -392,7 +392,7 @@ class npc_the_biggest_tree : public CreatureScript
                         {
                             playerGUID = player->GetGUID();
                             orphanGUID = getOrphanGUID(player, ORPHAN_ORACLE);
-                            if (orphanGUID)
+                            if (!orphanGUID.IsEmpty())
                                 phase = 1;
                         }
             }
@@ -487,7 +487,7 @@ class npc_high_oracle_soo_roo : public CreatureScript
                         {
                             playerGUID = player->GetGUID();
                             orphanGUID = getOrphanGUID(player, ORPHAN_ORACLE);
-                            if (orphanGUID)
+                            if (!orphanGUID.IsEmpty())
                                 phase = 1;
                         }
             }
@@ -583,7 +583,7 @@ class npc_elder_kekek : public CreatureScript
                         {
                             playerGUID = player->GetGUID();
                             orphanGUID = getOrphanGUID(player, ORPHAN_WOLVAR);
-                            if (orphanGUID)
+                            if (!orphanGUID.IsEmpty())
                                 phase = 1;
                         }
             }
@@ -697,7 +697,7 @@ class npc_the_etymidian : public CreatureScript
                         {
                             playerGUID = player->GetGUID();
                             orphanGUID = getOrphanGUID(player, ORPHAN_ORACLE);
-                            if (orphanGUID)
+                            if (!orphanGUID.IsEmpty())
                                 phase = 1;
                         }
                     }
@@ -819,14 +819,14 @@ class npc_alexstraza_the_lifebinder : public CreatureScript
                         {
                             playerGUID = player->GetGUID();
                             orphanGUID = getOrphanGUID(player, ORPHAN_ORACLE);
-                            if (orphanGUID)
+                            if (!orphanGUID.IsEmpty())
                                 phase = 1;
                         }
                         else if (player->GetQuestStatus(QUEST_THE_DRAGON_QUEEN_WOLVAR) == QUEST_STATUS_INCOMPLETE)
                         {
                             playerGUID = player->GetGUID();
                             orphanGUID = getOrphanGUID(player, ORPHAN_WOLVAR);
-                            if (orphanGUID)
+                            if (!orphanGUID.IsEmpty())
                                 phase = 7;
                         }
                     }
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
index ca034462c35..bd7ef61a80a 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp
@@ -240,7 +240,7 @@ public:
         {
             if (CheckTimer <= diff)
             {
-                if (AzgalorGUID)
+                if (!AzgalorGUID.IsEmpty())
                 {
                     Creature* boss = ObjectAccessor::GetCreature(*me, AzgalorGUID);
                     if (!boss || boss->isDead())
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
index ebb2495d95b..5f374086601 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -824,7 +824,7 @@ void hyjalAI::UpdateAI(uint32 diff)
     {
         for (uint8 i = 0; i < 2; ++i)
         {
-            if (BossGUID[i])
+            if (!BossGUID[i].IsEmpty())
             {
                 Unit* unit = ObjectAccessor::GetUnit(*me, BossGUID[i]);
                 if (unit && (!unit->IsAlive()))
diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
index 3019c728530..171ce1fe342 100644
--- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
@@ -336,7 +336,7 @@ public:
             {
                 Player* warrior = nullptr;
 
-                if (PlayerGUID)
+                if (!PlayerGUID.IsEmpty())
                     warrior = ObjectAccessor::GetPlayer(*me, PlayerGUID);
 
                 if (!warrior)
@@ -349,7 +349,7 @@ public:
 
                     for (uint8 i = 0; i < 6; ++i) // unsummon challengers
                     {
-                        if (AffrayChallenger[i])
+                        if (!AffrayChallenger[i].IsEmpty())
                         {
                             Creature* creature = ObjectAccessor::GetCreature((*me), AffrayChallenger[i]);
                             if (creature && creature->IsAlive())
@@ -357,7 +357,7 @@ public:
                         }
                     }
 
-                    if (BigWill) // unsummon bigWill
+                    if (!BigWill.IsEmpty()) // unsummon bigWill
                     {
                         Creature* creature = ObjectAccessor::GetCreature((*me), BigWill);
                         if (creature && creature->IsAlive())
@@ -398,7 +398,7 @@ public:
                     {
                         for (uint8 i = 0; i < 6; ++i)
                         {
-                            if (AffrayChallenger[i])
+                            if (!AffrayChallenger[i].IsEmpty())
                             {
                                 Creature* creature = ObjectAccessor::GetCreature((*me), AffrayChallenger[i]);
                                 if ((!creature || (!creature->IsAlive())) && !ChallengerDown[i])
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();
 
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
index eb980429789..1b75a8717da 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
@@ -204,7 +204,7 @@ struct boss_lady_vashj : public BossAI
 
         for (uint8 i = 0; i < 4; ++i)
         {
-            if (ShieldGeneratorChannel[i])
+            if (!ShieldGeneratorChannel[i].IsEmpty())
             {
                 if (Unit* remo = ObjectAccessor::GetUnit(*me, ShieldGeneratorChannel[i]))
                 {
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 fe9bd6da08f..82a2d2616f2 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
@@ -332,9 +332,9 @@ struct boss_leotheras_the_blind : public BossAI
     //Despawn all Inner Demon summoned
     void DespawnDemon()
     {
-        for (uint8 i=0; i<5; ++i)
+        for (uint8 i = 0; i < 5; ++i)
         {
-            if (InnderDemon[i])
+            if (!InnderDemon[i].IsEmpty())
             {
                 //delete creature
                 Creature* creature = ObjectAccessor::GetCreature((*me), InnderDemon[i]);
@@ -352,7 +352,7 @@ struct boss_leotheras_the_blind : public BossAI
     {
         for (uint8 i = 0; i < 5; ++i)
         {
-            if (InnderDemon[i])
+            if (!InnderDemon[i].IsEmpty())
             {
                 Creature* unit = ObjectAccessor::GetCreature((*me), InnderDemon[i]);
                 if (unit && unit->IsAlive())
@@ -381,7 +381,7 @@ struct boss_leotheras_the_blind : public BossAI
         Talk(SAY_DEATH);
 
         //despawn copy
-        if (Demon)
+        if (!Demon.IsEmpty())
         {
             if (Creature* pDemon = ObjectAccessor::GetCreature(*me, Demon))
                 pDemon->DespawnOrUnsummon();
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
index f66208e6fb7..9f9af0bba2c 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
@@ -162,7 +162,7 @@ struct boss_omor_the_unscarred : public BossAI
                     OrbitalStrike_Timer = 14000 + rand32() % 2000;
                     PlayerGUID = temp->GetGUID();
 
-                    if (PlayerGUID)
+                    if (!PlayerGUID.IsEmpty())
                         CanPullBack = true;
                 }
             }
diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
index 0267fa947bf..e6d9b36662a 100644
--- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
@@ -414,7 +414,7 @@ public:
 
             if (id == 1)
             {
-                if (PlayerGUID)
+                if (!PlayerGUID.IsEmpty())
                     PlayerGUID.Clear();
 
                 me->DespawnOrUnsummon(1ms);
@@ -430,7 +430,7 @@ public:
                     if (FlyTimer <= diff)
                     {
                         Tapped = false;
-                        if (PlayerGUID)
+                        if (!PlayerGUID.IsEmpty())
                         {
                             Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID);
                             if (player && player->GetQuestStatus(QUEST_THE_FORCE_OF_NELTHARAKU) == QUEST_STATUS_INCOMPLETE)
@@ -1220,7 +1220,7 @@ void npc_lord_illidan_stormrage::npc_lord_illidan_stormrageAI::SummonNextWave()
 
             if (WaveCount < 3)//1-3 Wave
             {
-                if (PlayerGUID)
+                if (!PlayerGUID.IsEmpty())
                 {
                     if (Player* target = ObjectAccessor::GetPlayer(*me, PlayerGUID))
                     {
@@ -1235,7 +1235,7 @@ void npc_lord_illidan_stormrage::npc_lord_illidan_stormrageAI::SummonNextWave()
             if (WavesInfo[WaveCount].CreatureId == 22076) // Torloth
             {
                 ENSURE_AI(npc_torloth_the_magnificent::npc_torloth_the_magnificentAI, Spawn->AI())->LordIllidanGUID = me->GetGUID();
-                if (PlayerGUID)
+                if (!PlayerGUID.IsEmpty())
                     ENSURE_AI(npc_torloth_the_magnificent::npc_torloth_the_magnificentAI, Spawn->AI())->AggroTargetGUID = PlayerGUID;
             }
         }
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 22028fa1d39..006ccf2fb4c 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -3428,7 +3428,7 @@ class spell_gen_spirit_healer_res : public SpellScript
         if (Unit* target = GetHitUnit())
         {
             WorldPacket data(SMSG_SPIRIT_HEALER_CONFIRM, 8);
-            data << uint64(target->GetGUID());
+            data << target->GetGUID();
             originalCaster->SendDirectMessage(&data);
         }
     }