diff options
author | megamage <none@none> | 2009-03-31 14:21:20 -0600 |
---|---|---|
committer | megamage <none@none> | 2009-03-31 14:21:20 -0600 |
commit | a0dfedfab6c4a52feccde5bc8707935c7873110f (patch) | |
tree | 8a0c151653569c26bf9a28a994ed0c23d9d0fe0d /src | |
parent | 4afd030b48c428af9775340cac9574118cee78d2 (diff) | |
parent | f2df7bbdcc7ba952083d3eb96230ee2eea391fd8 (diff) |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src')
-rw-r--r-- | src/game/SocialMgr.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/SocialMgr.cpp b/src/game/SocialMgr.cpp index 86fb60cf5a3..ba486300be9 100644 --- a/src/game/SocialMgr.cpp +++ b/src/game/SocialMgr.cpp @@ -188,6 +188,9 @@ void SocialMgr::GetFriendInfo(Player *player, uint32 friendGUID, FriendInfo &fri Player *pFriend = ObjectAccessor::FindPlayer(friendGUID); + if(!pFriend) + return; + uint32 team = player->GetTeam(); uint32 security = player->GetSession()->GetSecurity(); bool allowTwoSideWhoList = sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_WHO_LIST); |