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

(cherry picked from commit 68f45e87345ff85341f835f0372f2a62b89f24d9)

2 files changed, 3 insertions, 4 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)