Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-02-02 09:54:23 -06:00
parent 5299225a8b 4ae4e83e68
commit bb39eba6c7
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/game/GroupHandler.cpp
View File

@@ -555,8 +555,17 @@ 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 (movedPlayer->isInCombat())
{
WorldPacket data(SMSG_GROUP_SWAP_FAILED, (0));
SendPacket(&data);
return;
}
// everything's fine, do it
group->ChangeMembersGroup(objmgr.GetPlayer(name.c_str()), groupNr);
group->ChangeMembersGroup(movedPlayer), groupNr);
}
void WorldSession::HandleGroupAssistantOpcode( WorldPacket & recv_data )