aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormegamage <none@none>2008-12-22 23:43:48 -0600
committermegamage <none@none>2008-12-22 23:43:48 -0600
commitcbe749aa204a8f8ea7ec4592b4380ef5864d70fc (patch)
tree120cfa54b820a4a364041099161c2eae1c2c3dbd
parentde11cc3f8ecb3edff0c720f669077594f9602214 (diff)
*prevent crashes in Player::_LoadArenaTeamInfo(). By DasBlub.
--HG-- branch : trunk
-rw-r--r--src/game/Player.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 1f3e4e120f9..d2d2bbafe4e 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -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