[9952] Allow update subgroup in raid for offline players.

Also prevent crash and wrong subgroup number send from client.
mangos · May 22, 2010 · e91fbf9 · e91fbf9
1 parent caa916d
commit e91fbf9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp
@@ -510,6 +510,9 @@ void WorldSession::HandleGroupChangeSubGroupOpcode( WorldPacket & recv_data )
 
     recv_data >> groupNr;
 
+    if (groupNr >= MAX_RAID_SUBGROUPS)
+        return;
+
     // we will get correct pointer for group here, so we don't have to check if group is BG raid
     Group *group = GetPlayer()->GetGroup();
     if(!group)
@@ -524,7 +527,10 @@ void WorldSession::HandleGroupChangeSubGroupOpcode( WorldPacket & recv_data )
     /********************/
 
     // everything is fine, do it
-    group->ChangeMembersGroup(sObjectMgr.GetPlayer(name.c_str()), groupNr);
+    if (Player* player = sObjectMgr.GetPlayer(name.c_str()))
+        group->ChangeMembersGroup(player, groupNr);
+    else
+        group->ChangeMembersGroup(sObjectMgr.GetPlayerGUIDByName(name.c_str()), groupNr);
 }
 
 void WorldSession::HandleGroupAssistantLeaderOpcode( WorldPacket & recv_data )

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9951"
+ #define REVISION_NR "9952"
 #endif // __REVISION_NR_H__