From 089105e607c5f5deae3e3562b7af8318598dd01a Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Sat, 21 Feb 2009 18:10:41 -0600
Subject: *Fix a crash bug in HandleGroupChangeSubGroupOpcode.

--HG--
branch : trunk
---
 src/game/GroupHandler.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

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));
-- 
cgit v1.2.3