Merge branch 'master' of github.com:azerothcore/azerothcore-wotlk into Playerbot

src/server/game/Battlegrounds/Arena.cpp

@@ -242,6 +242,7 @@ void Arena::EndBattleground(TeamId winnerTeamId)
             uint8 memberId = 0;
             for (auto const& [playerGuid, arenaLogEntryData] : ArenaLogEntries)
             {
+                auto const& score = PlayerScores.find(playerGuid.GetCounter());
                 stmt2 = CharacterDatabase.GetPreparedStatement(CHAR_INS_ARENA_LOG_MEMBERSTATS);
                 stmt2->SetData(0, fightId);
                 stmt2->SetData(1, ++memberId);
@@ -250,9 +251,18 @@ void Arena::EndBattleground(TeamId winnerTeamId)
                 stmt2->SetData(4, arenaLogEntryData.ArenaTeamId);
                 stmt2->SetData(5, arenaLogEntryData.Acc);
                 stmt2->SetData(6, arenaLogEntryData.IP);
-                stmt2->SetData(7, arenaLogEntryData.DamageDone);
-                stmt2->SetData(8, arenaLogEntryData.HealingDone);
-                stmt2->SetData(9, arenaLogEntryData.KillingBlows);
+                if (score != PlayerScores.end())
+                {
+                    stmt2->SetData(7, score->second->GetDamageDone());
+                    stmt2->SetData(8, score->second->GetHealingDone());
+                    stmt2->SetData(9, score->second->GetKillingBlows());
+                }
+                else
+                {
+                    stmt2->SetData(7, 0);
+                    stmt2->SetData(8, 0);
+                    stmt2->SetData(9, 0);
+                }
                 trans->Append(stmt2);
             }
 

src/server/game/Battlegrounds/Arena.h

@@ -63,4 +63,4 @@ private:
     void EndBattleground(TeamId winnerTeamId) override;
 };
 
-#endif // WARHEAD_ARENA_H
+#endif // ACORE_ARENA_H

src/server/game/Battlegrounds/ArenaScore.h

@@ -72,4 +72,4 @@ protected:
     std::string TeamName{};
 };
 
-#endif // WARHEAD_ARENA_SCORE_H
+#endif // ACORE_ARENA_SCORE_H

src/server/game/Battlegrounds/Battleground.h

@@ -268,9 +268,6 @@ public:
     uint32 Acc{0};
     uint32 ArenaTeamId{0};
     std::string IP{};
-    uint32 DamageDone{0};
-    uint32 HealingDone{0};
-    uint32 KillingBlows{0};
 };
 
 enum BGHonorMode

src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp

@@ -551,6 +551,6 @@ void BattlegroundAB::ApplyPhaseMask()
     for (auto const& itr : bgPlayerMap)
     {
         itr.second->SetPhaseMask(phaseMask, false);
-        itr.second->UpdateObjectVisibility(true, false);
+        itr.second->UpdateObjectVisibility(true);
     }
 }