aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game/GroupHandler.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp
index 79007564c38..cbbbe885ea2 100644
--- a/src/game/GroupHandler.cpp
+++ b/src/game/GroupHandler.cpp
@@ -555,8 +555,11 @@ void WorldSession::HandleGroupChangeSubGroupOpcode( WorldPacket & recv_data )
return;
/********************/
- //Do not allow leader to change group of player in combat
Player *movedPlayer=objmgr.GetPlayer(name.c_str());
+ if(!movePlayer)
+ return;
+
+ //Do not allow leader to change group of player in combat
if (movedPlayer->isInCombat())
{
WorldPacket data(SMSG_GROUP_SWAP_FAILED, (0));