Merge heads.

--HG-- branch : trunk
2008-12-23 10:03:14 +01:00
parent f40479e87f cbe749aa20
commit 691dd19864
14 changed files with 69 additions and 73 deletions
@@ -13717,6 +13717,11 @@ void Player::_LoadArenaTeamInfo(QueryResult *result)
        uint32 personal_rating = fields[3].GetUInt32();

        ArenaTeam* aTeam = objmgr.GetArenaTeamById(arenateamid);
+        if(!aTeam)
+        {
+            sLog.outError("FATAL: couldn't load arenateam %u", arenateamid);
+            continue;
+        }
        uint8  arenaSlot = aTeam->GetSlot();

        m_uint32Values[PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + arenaSlot * 6]     = arenateamid;      // TeamID