From 03c71517ecaeac3810ae8343f736b351b02da199 Mon Sep 17 00:00:00 2001 From: DasBlub Date: Mon, 22 Dec 2008 23:05:56 +0100 Subject: [PATCH] prevent crashes in Player::_LoadArenaTeamInfo() (cherry picked from commit 9f908e877d054ff9ab973082d631bb7199f292f6) Signed-off-by: Wyk3d --- src/game/Player.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 76716b079..e12a1619d 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -13748,6 +13748,10 @@ 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