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

(cherry picked from commit 68f45e87345ff85341f835f0372f2a62b89f24d9)

13 files changed, 27 insertions, 29 deletions

diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp
index 5d33e5d6e98..7c557055fd2 100644
--- a/src/server/scripts/Commands/cs_character.cpp
+++ b/src/server/scripts/Commands/cs_character.cpp
@@ -790,7 +790,7 @@ public:
             // Update level and reset XP, everything else will be updated at login
             CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_LEVEL);
             stmt->setUInt8(0, static_cast<uint8>(newlevel));
-            stmt->setUInt32(1, player->GetGUID());
+            stmt->setUInt32(1, player->GetGUID().GetCounter());
             CharacterDatabase.Execute(stmt);
         }
 
@@ -837,7 +837,7 @@ public:
             // Update level and reset XP, everything else will be updated at login
             CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_LEVEL);
             stmt->setUInt8(0, static_cast<uint8>(newlevel));
-            stmt->setUInt32(1, player->GetGUID());
+            stmt->setUInt32(1, player->GetGUID().GetCounter());
             CharacterDatabase.Execute(stmt);
         }
 
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index 99a5a524a2c..9b86dc7d576 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -1122,8 +1122,7 @@ public:
         {
             if (!pair.second)
                 continue;
-            ObjectGuid guid = ObjectGuid::Create<HighGuid::Player>(pair.first);
-            Player const* player = ObjectAccessor::FindConnectedPlayer(guid);
+            Player const* player = ObjectAccessor::FindConnectedPlayer(pair.first);
             handler->PSendSysMessage(LANG_COMMAND_NPC_SHOWLOOT_SUBLABEL, player ? player->GetName() : Trinity::StringFormat("Offline player ({})", pair.first.ToString()), pair.second->size());
 
             for (auto it = pair.second->cbegin(); it != pair.second->cend(); ++it)
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
index dfc591f591d..df0eb7e6686 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
@@ -149,8 +149,8 @@ struct boss_vaelastrasz : public BossAI
                         break;
                     case EVENT_SPEECH_4:
                         me->SetFaction(FACTION_DRAGONFLIGHT_BLACK);
-                        if (PlayerGUID && ObjectAccessor::GetUnit(*me, PlayerGUID))
-                            AttackStart(ObjectAccessor::GetUnit(*me, PlayerGUID));;
+                        if (Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID))
+                            AttackStart(player);
                         break;
                 }
             }
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
index f641abf1763..54341e97794 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
@@ -426,7 +426,7 @@ class npc_akilzon_eagle : public CreatureScript
             void MovementInform(uint32, uint32) override
             {
                 arrived = true;
-                if (TargetGUID)
+                if (!TargetGUID.IsEmpty())
                 {
                     if (Unit* target = ObjectAccessor::GetUnit(*me, TargetGUID))
                         DoCast(target, SPELL_EAGLE_SWOOP, true);
diff --git a/src/server/scripts/Kalimdor/zone_azshara.cpp b/src/server/scripts/Kalimdor/zone_azshara.cpp
index 7114c620d09..41497207d6e 100644
--- a/src/server/scripts/Kalimdor/zone_azshara.cpp
+++ b/src/server/scripts/Kalimdor/zone_azshara.cpp
@@ -148,7 +148,7 @@ public:
 
         void AttackStart(Unit* who) override
         {
-            if (!who || PlayerGUID)
+            if (!who || !PlayerGUID.IsEmpty())
                 return;
 
             Player* player = who->ToPlayer();
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();
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);
diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp
index db48a98343e..e4dcf5ec4d5 100644
--- a/src/server/scripts/Spells/spell_hunter.cpp
+++ b/src/server/scripts/Spells/spell_hunter.cpp
@@ -692,7 +692,7 @@ class spell_hun_masters_call : public SpellScript
         // Do a mini Spell::CheckCasterAuras on the pet, no other way of doing this
         SpellCastResult result = SPELL_CAST_OK;
         uint32 const unitflag = pet->GetUnitFlags();
-        if (pet->GetCharmerGUID())
+        if (!pet->GetCharmerGUID().IsEmpty())
             result = SPELL_FAILED_CHARMED;
         else if (unitflag & UNIT_FLAG_STUNNED)
             result = SPELL_FAILED_STUNNED;