diff options
| author | Brian <runningnak3d@gmail.com> | 2010-02-14 19:13:14 -0700 | 
|---|---|---|
| committer | Brian <runningnak3d@gmail.com> | 2010-02-14 19:13:14 -0700 | 
| commit | 486c00891ba34884e5b2cdd8d44b4d8496f11283 (patch) | |
| tree | 7df304b9020ed21b87bd66978d2dc6e6683edce7 /src/game/GroupHandler.cpp | |
| parent | 7799ade4da0da17034039439d692122e976c0138 (diff) | |
* Core switch to client 3.3.2 (11403)
* Credits (in no particular order) to:
* n0n4m3, raczman, manuel, Spp, Malcrom, Teacher, QAston, Tartalo,
* thenecromancer, Xanadu, Trazom, Zor, kiper
* Additional credits to:
* TOM_RUS and NoFantasy from MaNGOS
* Thanks for testing Aokromes and XTElite1
* SoTA still needs some work, but is very playable (huge thanks to raczman and
* kiper)
* To upgrade, you need to apply all SQL from sql/updates/3.2.2a_old from the
* last rev you are on
* and then apply all SQL from sql/updates/3.3.2_old to char / realmd / world
* DBs
* Known problem with guild banks.
--HG--
branch : trunk
Diffstat (limited to 'src/game/GroupHandler.cpp')
| -rw-r--r-- | src/game/GroupHandler.cpp | 24 | 
1 files changed, 10 insertions, 14 deletions
diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp index 4f2a1dc4c8d..cf52bec2074 100644 --- a/src/game/GroupHandler.cpp +++ b/src/game/GroupHandler.cpp @@ -126,7 +126,7 @@ void WorldSession::HandleGroupInviteOpcode( WorldPacket & recv_data )      if(group)      {          // not have permissions for invite -        if(!group->IsLeader(GetPlayer()->GetGUID()) && !group->IsAssistant(GetPlayer()->GetGUID())) +        if(group->isRaidGroup() && !group->IsLeader(GetPlayer()->GetGUID()) && !group->IsAssistant(GetPlayer()->GetGUID()))          {              SendPartyResult(PARTY_OP_INVITE, "", PARTY_RESULT_YOU_NOT_LEADER);              return; @@ -428,9 +428,9 @@ void WorldSession::HandleMinimapPingOpcode(WorldPacket& recv_data)      // everything's fine, do it      WorldPacket data(MSG_MINIMAP_PING, (8+4+4)); -    data << GetPlayer()->GetGUID(); -    data << x; -    data << y; +    data << uint64(GetPlayer()->GetGUID()); +    data << float(x); +    data << float(y);      GetPlayer()->GetGroup()->BroadcastPacket(&data, true, -1, GetPlayer()->GetGUID());  } @@ -451,10 +451,10 @@ void WorldSession::HandleRandomRollOpcode(WorldPacket& recv_data)      //sLog.outDebug("ROLL: MIN: %u, MAX: %u, ROLL: %u", minimum, maximum, roll);      WorldPacket data(MSG_RANDOM_ROLL, 4+4+4+8); -    data << minimum; -    data << maximum; -    data << roll; -    data << GetPlayer()->GetGUID(); +    data << uint32(minimum); +    data << uint32(maximum); +    data << uint32(roll); +    data << uint64(GetPlayer()->GetGUID());      if(GetPlayer()->GetGroup())          GetPlayer()->GetGroup()->BroadcastPacket(&data, false);      else @@ -485,7 +485,7 @@ void WorldSession::HandleRaidTargetUpdateOpcode( WorldPacket & recv_data )          uint64 guid;          recv_data >> guid; -        group->SetTargetIcon(x, guid); +        group->SetTargetIcon(x, _player->GetGUID(), guid);      }  } @@ -535,11 +535,7 @@ void WorldSession::HandleGroupChangeSubGroupOpcode( WorldPacket & recv_data )      //Do not allow leader to change group of player in combat      if (movedPlayer->isInCombat()) -    { -        WorldPacket data(SMSG_GROUP_SWAP_FAILED, (0)); -        SendPacket(&data);          return; -    }      // everything's fine, do it      group->ChangeMembersGroup(movedPlayer, groupNr); @@ -586,7 +582,7 @@ void WorldSession::HandlePartyAssignmentOpcode( WorldPacket & recv_data )      // everything's fine, do it      if (flag == MEMBER_FLAG_MAINTANK)          group->SetMainTank(guid, apply); -         +      else if (flag == MEMBER_FLAG_MAINASSIST)          group->SetMainAssistant(guid, apply);  }  | 
