Core/Groups: Use full guid for battleground score storage

Shauren · Shauren · commit 96bd126236f8 · 2025-09-29T12:19:58.000+02:00
(cherry picked from commit 1ac720f)
diff --git a/src/server/game/Battlegrounds/Arena.cpp b/src/server/game/Battlegrounds/Arena.cpp
@@ -60,7 +60,7 @@ void Arena::AddPlayer(Player* player)
     bool const isInBattleground = IsPlayerInBattleground(player->GetGUID());
     Battleground::AddPlayer(player);
     if (!isInBattleground)
-        PlayerScores[player->GetGUID().GetCounter()] = new ArenaScore(player->GetGUID(), player->GetBGTeam());
+        PlayerScores[player->GetGUID()] = new ArenaScore(player->GetGUID(), player->GetBGTeam());
 
     if (player->GetBGTeam() == ALLIANCE)        // gold
     {
@@ -201,7 +201,7 @@ void Arena::EndBattleground(uint32 winner)
 
                 if (sWorld->getBoolConfig(CONFIG_ARENA_LOG_EXTENDED_INFO))
                     for (auto const& score : PlayerScores)
-                        if (Player* player = ObjectAccessor::FindConnectedPlayer(ObjectGuid(HighGuid::Player, score.first)))
+                        if (Player* player = ObjectAccessor::FindConnectedPlayer(score.first))
                         {
                             TC_LOG_DEBUG("bg.arena", "Statistics match Type: {} for {} (GUID: {}, Team: {}, IP: {}): {}",
                                 GetArenaType(), player->GetName(), score.first, player->GetArenaTeamId(GetArenaType() == 5 ? 2 : GetArenaType() == 3),
diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp
@@ -759,7 +759,7 @@ void Battleground::EndBattleground(uint32 winner)
         if (isBattleground() && sWorld->getBoolConfig(CONFIG_BATTLEGROUND_STORE_STATISTICS_ENABLE))
         {
             stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_PVPSTATS_PLAYER);
-            BattlegroundScoreMap::const_iterator score = PlayerScores.find(player->GetGUID().GetCounter());
+            BattlegroundScoreMap::const_iterator score = PlayerScores.find(player->GetGUID());
 
             stmt->setUInt32(0,  battlegroundId);
             stmt->setUInt32(1,  player->GetGUID().GetCounter());
@@ -845,7 +845,7 @@ void Battleground::RemovePlayerAtLeave(ObjectGuid guid, bool Transport, bool Sen
         participant = true;
     }
 
-    BattlegroundScoreMap::iterator itr2 = PlayerScores.find(guid.GetCounter());
+    BattlegroundScoreMap::iterator itr2 = PlayerScores.find(guid);
     if (itr2 != PlayerScores.end())
     {
         delete itr2->second;                                // delete player's score
@@ -1242,7 +1242,7 @@ void Battleground::BuildPvPLogDataPacket(WorldPackets::Battleground::PVPMatchSta
 
 bool Battleground::UpdatePlayerScore(Player* player, uint32 type, uint32 value, bool doAddHonor)
 {
-    BattlegroundScoreMap::const_iterator itr = PlayerScores.find(player->GetGUID().GetCounter());
+    BattlegroundScoreMap::const_iterator itr = PlayerScores.find(player->GetGUID());
     if (itr == PlayerScores.end()) // player not found...
         return false;
 
diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h
@@ -343,7 +343,7 @@ class TC_GAME_API Battleground
         BattlegroundPlayerMap const& GetPlayers() const { return m_Players; }
         uint32 GetPlayersSize() const { return m_Players.size(); }
 
-        typedef std::map<uint32, BattlegroundScore*> BattlegroundScoreMap;
+        typedef std::map<ObjectGuid, BattlegroundScore*> BattlegroundScoreMap;
         uint32 GetPlayerScoresSize() const { return PlayerScores.size(); }
 
         uint32 GetReviveQueueSize() const { return m_ReviveQueue.size(); }
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
@@ -231,7 +231,7 @@ void BattlegroundAB::AddPlayer(Player* player)
     bool const isInBattleground = IsPlayerInBattleground(player->GetGUID());
     Battleground::AddPlayer(player);
     if (!isInBattleground)
-        PlayerScores[player->GetGUID().GetCounter()] = new BattlegroundABScore(player->GetGUID());
+        PlayerScores[player->GetGUID()] = new BattlegroundABScore(player->GetGUID());
 }
 
 void BattlegroundAB::RemovePlayer(Player* /*player*/, ObjectGuid /*guid*/, uint32 /*team*/)
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
@@ -444,7 +444,7 @@ void BattlegroundAV::AddPlayer(Player* player)
     bool const isInBattleground = IsPlayerInBattleground(player->GetGUID());
     Battleground::AddPlayer(player);
     if (!isInBattleground)
-        PlayerScores[player->GetGUID().GetCounter()] = new BattlegroundAVScore(player->GetGUID());
+        PlayerScores[player->GetGUID()] = new BattlegroundAVScore(player->GetGUID());
 }
 
 void BattlegroundAV::EndBattleground(uint32 winner)
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
@@ -360,7 +360,7 @@ void BattlegroundEY::AddPlayer(Player* player)
     bool const isInBattleground = IsPlayerInBattleground(player->GetGUID());
     Battleground::AddPlayer(player);
     if (!isInBattleground)
-        PlayerScores[player->GetGUID().GetCounter()] = new BattlegroundEYScore(player->GetGUID());
+        PlayerScores[player->GetGUID()] = new BattlegroundEYScore(player->GetGUID());
 
     m_PlayersNearPoint[EY_POINTS_MAX].push_back(player->GetGUID());
 }
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
@@ -249,7 +249,7 @@ void BattlegroundIC::AddPlayer(Player* player)
     bool const isInBattleground = IsPlayerInBattleground(player->GetGUID());
     Battleground::AddPlayer(player);
     if (!isInBattleground)
-        PlayerScores[player->GetGUID().GetCounter()] = new BattlegroundICScore(player->GetGUID());
+        PlayerScores[player->GetGUID()] = new BattlegroundICScore(player->GetGUID());
 
     if (nodePoint[NODE_TYPE_QUARRY].nodeState == (player->GetTeamId() == TEAM_ALLIANCE ? NODE_STATE_CONTROLLED_A : NODE_STATE_CONTROLLED_H))
         player->CastSpell(player, SPELL_QUARRY, true);
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
@@ -483,7 +483,7 @@ void BattlegroundSA::AddPlayer(Player* player)
     bool const isInBattleground = IsPlayerInBattleground(player->GetGUID());
     Battleground::AddPlayer(player);
     if (!isInBattleground)
-        PlayerScores[player->GetGUID().GetCounter()] = new BattlegroundSAScore(player->GetGUID());
+        PlayerScores[player->GetGUID()] = new BattlegroundSAScore(player->GetGUID());
 
     SendTransportInit(player);
 
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
@@ -243,7 +243,7 @@ void BattlegroundWS::AddPlayer(Player* player)
     bool const isInBattleground = IsPlayerInBattleground(player->GetGUID());
     Battleground::AddPlayer(player);
     if (!isInBattleground)
-        PlayerScores[player->GetGUID().GetCounter()] = new BattlegroundWGScore(player->GetGUID());
+        PlayerScores[player->GetGUID()] = new BattlegroundWGScore(player->GetGUID());
 }
 
 void BattlegroundWS::RespawnFlag(uint32 Team, bool captured)

Original file line number	Diff line number	Diff line change
`@@ -759,7 +759,7 @@ void Battleground::EndBattleground(uint32 winner)`
`759`	`759`	`if (isBattleground() && sWorld->getBoolConfig(CONFIG_BATTLEGROUND_STORE_STATISTICS_ENABLE))`
`760`	`760`	`{`
`761`	`761`	`stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_PVPSTATS_PLAYER);`
`762`		`- BattlegroundScoreMap::const_iterator score = PlayerScores.find(player->GetGUID().GetCounter());`
	`762`	`+ BattlegroundScoreMap::const_iterator score = PlayerScores.find(player->GetGUID());`
`763`	`763`
`764`	`764`	`stmt->setUInt32(0, battlegroundId);`
`765`	`765`	`stmt->setUInt32(1, player->GetGUID().GetCounter());`
`@@ -845,7 +845,7 @@ void Battleground::RemovePlayerAtLeave(ObjectGuid guid, bool Transport, bool Sen`
`845`	`845`	`participant = true;`
`846`	`846`	`}`
`847`	`847`
`848`		`- BattlegroundScoreMap::iterator itr2 = PlayerScores.find(guid.GetCounter());`
	`848`	`+ BattlegroundScoreMap::iterator itr2 = PlayerScores.find(guid);`
`849`	`849`	`if (itr2 != PlayerScores.end())`
`850`	`850`	`{`
`851`	`851`	`delete itr2->second; // delete player's score`
`@@ -1242,7 +1242,7 @@ void Battleground::BuildPvPLogDataPacket(WorldPackets::Battleground::PVPMatchSta`
`1242`	`1242`
`1243`	`1243`	`bool Battleground::UpdatePlayerScore(Player* player, uint32 type, uint32 value, bool doAddHonor)`
`1244`	`1244`	`{`
`1245`		`- BattlegroundScoreMap::const_iterator itr = PlayerScores.find(player->GetGUID().GetCounter());`
	`1245`	`+ BattlegroundScoreMap::const_iterator itr = PlayerScores.find(player->GetGUID());`
`1246`	`1246`	`if (itr == PlayerScores.end()) // player not found...`
`1247`	`1247`	`return false;`
`1248`	`1248`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ void BattlegroundAB::AddPlayer(Player* player)`
`231`	`231`	`bool const isInBattleground = IsPlayerInBattleground(player->GetGUID());`
`232`	`232`	`Battleground::AddPlayer(player);`
`233`	`233`	`if (!isInBattleground)`
`234`		`- PlayerScores[player->GetGUID().GetCounter()] = new BattlegroundABScore(player->GetGUID());`
	`234`	`+ PlayerScores[player->GetGUID()] = new BattlegroundABScore(player->GetGUID());`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`void BattlegroundAB::RemovePlayer(Player* /player/, ObjectGuid /guid/, uint32 /team/)`
Original file line number	Diff line number	Diff line change
`@@ -444,7 +444,7 @@ void BattlegroundAV::AddPlayer(Player* player)`
`444`	`444`	`bool const isInBattleground = IsPlayerInBattleground(player->GetGUID());`
`445`	`445`	`Battleground::AddPlayer(player);`
`446`	`446`	`if (!isInBattleground)`
`447`		`- PlayerScores[player->GetGUID().GetCounter()] = new BattlegroundAVScore(player->GetGUID());`
	`447`	`+ PlayerScores[player->GetGUID()] = new BattlegroundAVScore(player->GetGUID());`
`448`	`448`	`}`
`449`	`449`
`450`	`450`	`void BattlegroundAV::EndBattleground(uint32 winner)`
Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ void BattlegroundEY::AddPlayer(Player* player)`
`360`	`360`	`bool const isInBattleground = IsPlayerInBattleground(player->GetGUID());`
`361`	`361`	`Battleground::AddPlayer(player);`
`362`	`362`	`if (!isInBattleground)`
`363`		`- PlayerScores[player->GetGUID().GetCounter()] = new BattlegroundEYScore(player->GetGUID());`
	`363`	`+ PlayerScores[player->GetGUID()] = new BattlegroundEYScore(player->GetGUID());`
`364`	`364`
`365`	`365`	`m_PlayersNearPoint[EY_POINTS_MAX].push_back(player->GetGUID());`
`366`	`366`	`}`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ void BattlegroundWS::AddPlayer(Player* player)`
`243`	`243`	`bool const isInBattleground = IsPlayerInBattleground(player->GetGUID());`
`244`	`244`	`Battleground::AddPlayer(player);`
`245`	`245`	`if (!isInBattleground)`
`246`		`- PlayerScores[player->GetGUID().GetCounter()] = new BattlegroundWGScore(player->GetGUID());`
	`246`	`+ PlayerScores[player->GetGUID()] = new BattlegroundWGScore(player->GetGUID());`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`void BattlegroundWS::RespawnFlag(uint32 Team, bool captured)`