Fix a crash in BattleGroundMgr::BuildPvpLogDataPacket caused by objmgr not finding player object by guid when showing scoreboard. In this case get bg team ID for player via character database. Closes #938

--HG--
branch : trunk

1 files changed, 15 insertions, 1 deletions

diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp
index 1259f26b0da..04cd3e03273 100644
--- a/src/game/BattleGroundMgr.cpp
+++ b/src/game/BattleGroundMgr.cpp
@@ -1336,8 +1336,22 @@ void BattleGroundMgr::BuildPvpLogDataPacket(WorldPacket *data, BattleGround *bg)
         *data << uint32(itr->second->KillingBlows);
         if (type) // if (bg->isArena())
         {
+            // BG Team ID (Green/Gold team, not faction teams in arena)
             Player *plr = objmgr.GetPlayer(itr->first);
-            *data << uint8(plr->GetBGTeam());               // BG Team ID (Green/Gold team, not faction teams in arena)
+            uint8 team = 0;
+            if (plr)
+                team = plr->GetBGTeam();
+            else
+            {
+                QueryResult *result = CharacterDatabase.PQuery("SELECT team FROM character_battleground_data WHERE guid = '%u'", GUID_LOPART(itr->first));
+                if (result)
+                {
+                    team = (*result)[0].GetUInt8();
+                    delete result;
+                }
+                else
+                    sLog.outError("Player GUID %u - unable to find correct BG Team ID for MSG_PVP_LOG_DATA (scoreboard). Defaulting to 0.", GUID_LOPART(itr->first));
+            }
         }
         else    // if (!bg->isArena())
         {