From 535f86e71fc3e4203b49cc82790ec014fd0531db Mon Sep 17 00:00:00 2001 From: Yaki Khadafi Date: Sun, 26 Aug 2012 14:09:22 +0300 Subject: [PATCH] [0186] Update group opcodes Signed-off-by: Yaki Khadafi --- src/game/Group.cpp | 3 +- src/game/Group.h | 57 ++++++--- src/game/GroupHandler.cpp | 259 +++++++++++++++++++++++++++----------- src/game/Opcodes.cpp | 53 ++++---- src/game/Opcodes.h | 53 ++++---- src/game/Unit.h | 2 +- src/game/WorldSession.h | 3 +- src/shared/revision_nr.h | 2 +- 8 files changed, 282 insertions(+), 150 deletions(-) diff --git a/src/game/Group.cpp b/src/game/Group.cpp index 047e8e0df..b1352a2dd 100644 --- a/src/game/Group.cpp +++ b/src/game/Group.cpp @@ -1040,6 +1040,7 @@ void Group::SendUpdate() { data << uint8(0); data << uint32(0); + data << uint8(0); } data << GetObjectGuid(); // group guid data << uint32(0); // 3.3, this value increments every time SMSG_GROUP_LIST is sent @@ -1057,7 +1058,7 @@ void Group::SendUpdate() data << uint8(onlineState); // online-state data << uint8(citr2->group); // groupid data << uint8(GetFlags(*citr2)); // group flags - data << uint8(0); // 3.3, role? + data << uint8(0); // roles mask } data << m_leaderGuid; // leader guid diff --git a/src/game/Group.h b/src/game/Group.h index 2f46660d4..74e529351 100644 --- a/src/game/Group.h +++ b/src/game/Group.h @@ -122,25 +122,48 @@ enum GroupUpdateFlags GROUP_UPDATE_FLAG_MAX_POWER = 0x00000020, // uint16 GROUP_UPDATE_FLAG_LEVEL = 0x00000040, // uint16 GROUP_UPDATE_FLAG_ZONE = 0x00000080, // uint16 - GROUP_UPDATE_FLAG_POSITION = 0x00000100, // uint16, uint16 - GROUP_UPDATE_FLAG_AURAS = 0x00000200, // uint64 mask, for each bit set uint32 spellid + uint8 unk - GROUP_UPDATE_FLAG_PET_GUID = 0x00000400, // uint64 pet guid - GROUP_UPDATE_FLAG_PET_NAME = 0x00000800, // pet name, NULL terminated string - GROUP_UPDATE_FLAG_PET_MODEL_ID = 0x00001000, // uint16, model id - GROUP_UPDATE_FLAG_PET_CUR_HP = 0x00002000, // uint32 pet cur health - GROUP_UPDATE_FLAG_PET_MAX_HP = 0x00004000, // uint32 pet max health - GROUP_UPDATE_FLAG_PET_POWER_TYPE = 0x00008000, // uint8 pet power type - GROUP_UPDATE_FLAG_PET_CUR_POWER = 0x00010000, // uint16 pet cur power - GROUP_UPDATE_FLAG_PET_MAX_POWER = 0x00020000, // uint16 pet max power - GROUP_UPDATE_FLAG_PET_AURAS = 0x00040000, // uint64 mask, for each bit set uint32 spellid + uint8 unk, pet auras... - GROUP_UPDATE_FLAG_VEHICLE_SEAT = 0x00080000, // uint32 vehicle_seat_id (index from VehicleSeat.dbc) - GROUP_UPDATE_PET = 0x0007FC00, // all pet flags - GROUP_UPDATE_FULL = 0x0007FFFF, // all known flags + GROUP_UPDATE_FLAG_UNK = 0x00000100, // uint16 + GROUP_UPDATE_FLAG_POSITION = 0x00000200, // uint16, uint16, uint16 + GROUP_UPDATE_FLAG_AURAS = 0x00000400, // uint64 mask, for each bit set uint32 spellid + uint8 unk + GROUP_UPDATE_FLAG_PET_GUID = 0x00000800, // uint64 pet guid + GROUP_UPDATE_FLAG_PET_NAME = 0x00001000, // pet name, NULL terminated string + GROUP_UPDATE_FLAG_PET_MODEL_ID = 0x00002000, // uint16, model id + GROUP_UPDATE_FLAG_PET_CUR_HP = 0x00004000, // uint32 pet cur health + GROUP_UPDATE_FLAG_PET_MAX_HP = 0x00008000, // uint32 pet max health + GROUP_UPDATE_FLAG_PET_POWER_TYPE = 0x00010000, // uint8 pet power type + GROUP_UPDATE_FLAG_PET_CUR_POWER = 0x00020000, // uint16 pet cur power + GROUP_UPDATE_FLAG_PET_MAX_POWER = 0x00040000, // uint16 pet max power + GROUP_UPDATE_FLAG_PET_AURAS = 0x00080000, // uint64 mask, for each bit set uint32 spellid + uint8 unk, pet auras... + GROUP_UPDATE_FLAG_VEHICLE_SEAT = 0x00100000, // uint32 vehicle_seat_id (index from VehicleSeat.dbc) + GROUP_UPDATE_FLAG_PHASE = 0x00200000, // uint32, uint32, some bitstring or string + + GROUP_UPDATE_PET = GROUP_UPDATE_FLAG_PET_GUID | + GROUP_UPDATE_FLAG_PET_NAME | + GROUP_UPDATE_FLAG_PET_MODEL_ID | + GROUP_UPDATE_FLAG_PET_CUR_HP | + GROUP_UPDATE_FLAG_PET_MAX_HP | + GROUP_UPDATE_FLAG_PET_POWER_TYPE | + GROUP_UPDATE_FLAG_PET_CUR_POWER | + GROUP_UPDATE_FLAG_PET_MAX_POWER | + GROUP_UPDATE_FLAG_PET_AURAS, + + GROUP_UPDATE_FULL = GROUP_UPDATE_PET | + GROUP_UPDATE_FLAG_STATUS | + GROUP_UPDATE_FLAG_CUR_HP | + GROUP_UPDATE_FLAG_MAX_HP | + GROUP_UPDATE_FLAG_POWER_TYPE | + GROUP_UPDATE_FLAG_CUR_POWER | + GROUP_UPDATE_FLAG_MAX_POWER | + GROUP_UPDATE_FLAG_LEVEL | + GROUP_UPDATE_FLAG_ZONE | + GROUP_UPDATE_FLAG_POSITION | + GROUP_UPDATE_FLAG_AURAS | + GROUP_UPDATE_FLAG_PHASE, }; -#define GROUP_UPDATE_FLAGS_COUNT 20 -// 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,11,12,13,14,15,16,17,18,19 -static const uint8 GroupUpdateLength[GROUP_UPDATE_FLAGS_COUNT] = { 0, 2, 2, 2, 1, 2, 2, 2, 2, 4, 8, 8, 1, 2, 2, 2, 1, 2, 2, 8}; +#define GROUP_UPDATE_FLAGS_COUNT 22 + // 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,11,12,13,14,15,16,17,18,19,20,21 +static const uint8 GroupUpdateLength[GROUP_UPDATE_FLAGS_COUNT] = { 0, 2, 2, 2, 1, 2, 2, 2, 2, 2, 6, 8, 8, 1, 2, 2, 2, 1, 2, 2, 8, 5 }; class Roll : public LootValidatorRef { diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp index 12f56843c..378e2fefe 100644 --- a/src/game/GroupHandler.cpp +++ b/src/game/GroupHandler.cpp @@ -45,34 +45,61 @@ void WorldSession::SendPartyResult(PartyOperation operation, const std::string& member, PartyResult res) { - WorldPacket data(SMSG_PARTY_COMMAND_RESULT, (4 + member.size() + 1 + 4 + 4)); + WorldPacket data(SMSG_PARTY_COMMAND_RESULT, 4 + member.size() + 1 + 4 + 4 + 8); data << uint32(operation); data << member; // max len 48 data << uint32(res); data << uint32(0); // LFD cooldown related (used with ERR_PARTY_LFG_BOOT_COOLDOWN_S and ERR_PARTY_LFG_BOOT_NOT_ELIGIBLE_S) + data << ObjectGuid(); // if result == 27 (ERR_VOTE_KICK_REASON_NEEDED), then it's guid of player being kicked (member's guid) SendPacket(&data); } void WorldSession::SendGroupInvite(Player* player, bool alreadyInGroup /*= false*/) { - WorldPacket data(SMSG_GROUP_INVITE, 10); // guess size - data << uint8(alreadyInGroup ? 0 : 1); // invited/already in group flag - data << GetPlayer()->GetName(); // max len 48 - data << uint32(0); // unk - data << uint8(0); // count + WorldPacket data(SMSG_GROUP_INVITE, 21); // guess size + data.WriteBit(0); + data.WriteGuidMask<0, 3, 2>(player->GetObjectGuid()); + data.WriteBit(!alreadyInGroup); + data.WriteGuidMask<6, 5>(player->GetObjectGuid()); + data.WriteBits(0, 9); // realm name length + data.WriteGuidMask<4>(player->GetObjectGuid()); + data.WriteBits(strlen(player->GetName()), 7); + data.WriteBits(0, 24); // count + data.WriteBit(0); + data.WriteGuidMask<1, 7>(player->GetObjectGuid()); + + data.WriteGuidBytes<1, 4>(player->GetObjectGuid()); + data << uint32(WorldTimer::getMSTime()); + data << uint32(0) << uint32(0); + data.WriteGuidBytes<6, 0, 2, 3>(player->GetObjectGuid()); // for(int i = 0; i < count; ++i) // data << uint32(0); - data << uint32(0); // unk + data.WriteGuidBytes<5>(player->GetObjectGuid()); + data.WriteGuidBytes<7>(player->GetObjectGuid()); + data.append(player->GetName(), strlen(player->GetName())); + data << uint32(0); player->GetSession()->SendPacket(&data); } void WorldSession::HandleGroupInviteOpcode(WorldPacket& recv_data) { - std::string membername; - recv_data >> membername; - recv_data.read_skip(); // roles mask? + ObjectGuid guid; + + recv_data.read_skip(); // cross-realm party related + recv_data.read_skip(); // roles mask? + + recv_data.ReadGuidMask<2, 7>(guid); + uint32 realmLength = recv_data.ReadBits(9); + recv_data.ReadGuidMask<3>(guid); + uint32 nameLength = recv_data.ReadBits(10); + recv_data.ReadGuidMask<5, 4, 6, 0, 1>(guid); + + recv_data.ReadGuidBytes<4, 7, 6>(guid); + + std::string membername = recv_data.ReadString(nameLength); + std::string realmname = recv_data.ReadString(realmLength); // attempt add selected player @@ -191,71 +218,71 @@ void WorldSession::HandleGroupInviteOpcode(WorldPacket& recv_data) SendPartyResult(PARTY_OP_INVITE, membername, ERR_PARTY_RESULT_OK); } -void WorldSession::HandleGroupAcceptOpcode(WorldPacket& recv_data) +void WorldSession::HandleGroupInviteResponseOpcode(WorldPacket& recv_data) { - recv_data.read_skip(); // roles mask? + bool unk = recv_data.ReadBit(); + bool accepted = recv_data.ReadBit(); + if (unk) + recv_data.read_skip(); Group* group = GetPlayer()->GetGroupInvite(); if (!group) return; - if (group->GetLeaderGuid() == GetPlayer()->GetObjectGuid()) + if (accepted) { - sLog.outError("HandleGroupAcceptOpcode: %s tried to accept an invite to his own group", - GetPlayer()->GetGuidStr().c_str()); - return; - } + // remove in from invites in any case + group->RemoveInvite(GetPlayer()); - // remove in from invites in any case - group->RemoveInvite(GetPlayer()); + if (group->GetLeaderGuid() == GetPlayer()->GetObjectGuid()) + { + sLog.outError("HandleGroupInviteResponseOpcode: %s tried to accept an invite to his own group", + GetPlayer()->GetGuidStr().c_str()); + return; + } - /** error handling **/ - /********************/ + /** error handling **/ + /********************/ - // not have place - if (group->IsFull()) - { - SendPartyResult(PARTY_OP_INVITE, "", ERR_GROUP_FULL); - return; - } + // not have place + if (group->IsFull()) + { + SendPartyResult(PARTY_OP_INVITE, "", ERR_GROUP_FULL); + return; + } - Player* leader = sObjectMgr.GetPlayer(group->GetLeaderGuid()); + Player* leader = sObjectMgr.GetPlayer(group->GetLeaderGuid()); - // forming a new group, create it - if (!group->IsCreated()) - { - if (leader) - group->RemoveInvite(leader); - if (group->Create(group->GetLeaderGuid(), group->GetLeaderName())) - sObjectMgr.AddGroup(group); - else + // forming a new group, create it + if (!group->IsCreated()) + { + if (leader) + group->RemoveInvite(leader); + if (group->Create(group->GetLeaderGuid(), group->GetLeaderName())) + sObjectMgr.AddGroup(group); + else + return; + } + + // everything is fine, do it, PLAYER'S GROUP IS SET IN ADDMEMBER!!! + if (!group->AddMember(GetPlayer()->GetObjectGuid(), GetPlayer()->GetName())) return; } + else + { + // uninvite, group can be deleted + GetPlayer()->UninviteFromGroup(); - // everything is fine, do it, PLAYER'S GROUP IS SET IN ADDMEMBER!!! - if (!group->AddMember(GetPlayer()->GetObjectGuid(), GetPlayer()->GetName())) - return; -} + // remember leader if online + Player* leader = sObjectMgr.GetPlayer(group->GetLeaderGuid()); + if (!leader || !leader->GetSession()) + return; -void WorldSession::HandleGroupDeclineOpcode(WorldPacket& /*recv_data*/) -{ - Group* group = GetPlayer()->GetGroupInvite(); - if (!group) - return; - - // remember leader if online - Player* leader = sObjectMgr.GetPlayer(group->GetLeaderGuid()); - - // uninvite, group can be deleted - GetPlayer()->UninviteFromGroup(); - - if (!leader || !leader->GetSession()) - return; - - // report - WorldPacket data(SMSG_GROUP_DECLINE, 10); // guess size - data << GetPlayer()->GetName(); - leader->GetSession()->SendPacket(&data); + // report + WorldPacket data(SMSG_GROUP_DECLINE, 10); // guess size + data << GetPlayer()->GetName(); + leader->GetSession()->SendPacket(&data); + } } void WorldSession::HandleGroupUninviteGuidOpcode(WorldPacket& recv_data) @@ -726,19 +753,39 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacke if (mask & GROUP_UPDATE_FLAG_ZONE) *data << uint16(player->GetZoneId()); + if (mask & GROUP_UPDATE_FLAG_UNK) + *data << uint16(0); + if (mask & GROUP_UPDATE_FLAG_POSITION) - *data << uint16(player->GetPositionX()) << uint16(player->GetPositionY()); + *data << uint16(player->GetPositionX()) << uint16(player->GetPositionY()) << uint16(player->GetPositionZ()); if (mask & GROUP_UPDATE_FLAG_AURAS) { + *data << uint8(0); // if true, client clears all auras that are not in auramask and whose index is lower amount sent below const uint64& auramask = player->GetAuraUpdateMask(); *data << uint64(auramask); + *data << uint32(MAX_AURAS); // server sends here number of visible auras, but client checks + // if aura is in auramask, so it seems no difference if there will be MAX_AURAS for (uint32 i = 0; i < MAX_AURAS; ++i) { if (auramask & (uint64(1) << i)) { - *data << uint32(player->GetVisibleAura(i)->GetId()); - *data << uint8(1); + if (SpellAuraHolder* holder = player->GetVisibleAura(i)) + { + *data << uint32(holder->GetId()); + *data << uint16(holder->GetAuraFlags()); + if (holder->GetAuraFlags() & AFLAG_EFFECT_AMOUNT_SEND) + for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i) + if (Aura* aura = holder->GetAuraByEffectIndex(SpellEffectIndex(i))) + *data << int32(aura->GetModifier()->m_amount); + else + *data << int32(0); + } + else + { + *data << uint32(0); + *data << uint16(0); + } } } } @@ -807,19 +854,50 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacke { if (pet) { + *data << uint8(0); // if true, client clears all auras that are not in auramask and whose index is lower amount sent below const uint64& auramask = pet->GetAuraUpdateMask(); *data << uint64(auramask); + *data << uint32(MAX_AURAS); // server sends here number of visible auras, but client checks + // if aura is in auramask, so it seems no difference if there will be MAX_AURAS for (uint32 i = 0; i < MAX_AURAS; ++i) { if (auramask & (uint64(1) << i)) { - *data << uint32(pet->GetVisibleAura(i)->GetId()); - *data << uint8(1); + if (SpellAuraHolder* holder = pet->GetVisibleAura(i)) + { + *data << uint32(holder->GetId()); + *data << uint16(holder->GetAuraFlags()); + if (holder->GetAuraFlags() & AFLAG_EFFECT_AMOUNT_SEND) + for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i) + if (Aura* aura = holder->GetAuraByEffectIndex(SpellEffectIndex(i))) + *data << int32(aura->GetModifier()->m_amount); + else + *data << int32(0); + } + else + { + *data << uint32(0); + *data << uint16(0); + } } } } else + { + *data << uint8(0); *data << uint64(0); + *data << uint32(0); + } + } + + if (mask & GROUP_UPDATE_FLAG_VEHICLE_SEAT) + *data << int32(0); + + if (mask & GROUP_UPDATE_FLAG_PHASE) + { + *data << uint32(8); + *data << uint32(0); + *data << uint8(0); } } @@ -848,9 +926,14 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recv_data) data << uint8(0); // only for SMSG_PARTY_MEMBER_STATS_FULL, probably arena/bg related data << player->GetPackGUID(); - uint32 mask1 = 0x00040BFF; // common mask, real flags used 0x000040BFF + uint32 mask1 = GROUP_UPDATE_FLAG_STATUS | GROUP_UPDATE_FLAG_CUR_HP | GROUP_UPDATE_FLAG_MAX_HP | + GROUP_UPDATE_FLAG_POWER_TYPE | GROUP_UPDATE_FLAG_CUR_POWER | GROUP_UPDATE_FLAG_MAX_POWER | + GROUP_UPDATE_FLAG_LEVEL | GROUP_UPDATE_FLAG_ZONE | GROUP_UPDATE_FLAG_POSITION | + GROUP_UPDATE_FLAG_AURAS | GROUP_UPDATE_FLAG_PET_NAME | GROUP_UPDATE_FLAG_PET_AURAS | + GROUP_UPDATE_FLAG_PHASE; + if (pet) - mask1 = 0x7FFFFFFF; // for hunters and other classes with pets + mask1 = 0x7FEFFEFF; // full mask & ~(GROUP_UPDATE_FLAG_VEHICLE_SEAT | GROUP_UPDATE_FLAG_UNK) Powers powerType = player->getPowerType(); data << uint32(mask1); // group update mask @@ -866,12 +949,14 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recv_data) uint16 iZoneId = 0; uint16 iCoordX = 0; uint16 iCoordY = 0; + uint16 iCoordZ = 0; if (player->IsInWorld()) { iZoneId = player->GetZoneId(); iCoordX = player->GetPositionX(); iCoordY = player->GetPositionY(); + iCoordZ = player->GetPositionZ(); } else if (player->IsBeingTeleported()) // Player is in teleportation { @@ -879,6 +964,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recv_data) iZoneId = sTerrainMgr.GetZoneId(loc.mapid, loc.coord_x, loc.coord_y, loc.coord_z); iCoordX = loc.coord_x; iCoordY = loc.coord_y; + iCoordZ = loc.coord_z; } else { @@ -888,17 +974,27 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recv_data) data << uint16(iZoneId); // GROUP_UPDATE_FLAG_ZONE data << uint16(iCoordX); // GROUP_UPDATE_FLAG_POSITION data << uint16(iCoordY); // GROUP_UPDATE_FLAG_POSITION + data << uint16(iCoordZ); // GROUP_UPDATE_FLAG_POSITION + data << uint8(1); // if true, client clears all auras that are not in auramask and whose index is lower amount sent below uint64 auramask = 0; size_t maskPos = data.wpos(); - data << uint64(auramask); // placeholder + data << uint64(auramask); // placeholder, server sends 0xFFFFFFFFFFFFFFFF here, but with 1 above it seems no difference + data << uint32(MAX_AURAS); // server sends here number of visible auras, but client checks + // if aura is in auramask, so it seems no difference if there will be MAX_AURAS for (uint8 i = 0; i < MAX_AURAS; ++i) { - if (uint32 aura = player->GetVisibleAura(i)->GetId()) + if (SpellAuraHolder* holder = player->GetVisibleAura(i)) { auramask |= (uint64(1) << i); - data << uint32(aura); - data << uint8(1); + data << uint32(holder->GetId()); + data << uint16(holder->GetAuraFlags()); + if (holder->GetAuraFlags() & AFLAG_EFFECT_AMOUNT_SEND) + for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i) + if (Aura* aura = holder->GetAuraByEffectIndex(SpellEffectIndex(i))) + data << int32(aura->GetModifier()->m_amount); + else + data << int32(0); } } data.put(maskPos, auramask); // GROUP_UPDATE_FLAG_AURAS @@ -915,16 +1011,25 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recv_data) data << uint16(pet->GetPower(petpowertype)); // GROUP_UPDATE_FLAG_PET_CUR_POWER data << uint16(pet->GetMaxPower(petpowertype)); // GROUP_UPDATE_FLAG_PET_MAX_POWER + data << uint8(1); // if true, client clears all auras that are not in auramask and whose index is lower amount sent below uint64 petauramask = 0; size_t petMaskPos = data.wpos(); - data << uint64(petauramask); // placeholder + data << uint64(petauramask); // placeholder, server sends 0xFFFFFFFFFFFFFFFF here, but with 1 above it seems no difference + data << uint32(MAX_AURAS); // server sends here number of visible auras, but client checks + // if aura is in auramask, so it seems no difference if there will be MAX_AURAS for (uint8 i = 0; i < MAX_AURAS; ++i) { - if (uint32 petaura = pet->GetVisibleAura(i)->GetId()) + if (SpellAuraHolder* holder = pet->GetVisibleAura(i)) { petauramask |= (uint64(1) << i); - data << uint32(petaura); - data << uint8(1); + data << uint32(holder->GetId()); + data << uint16(holder->GetAuraFlags()); + if (holder->GetAuraFlags() & AFLAG_EFFECT_AMOUNT_SEND) + for (uint32 i = 0; i < MAX_EFFECT_INDEX; ++i) + if (Aura* aura = holder->GetAuraByEffectIndex(SpellEffectIndex(i))) + data << int32(aura->GetModifier()->m_amount); + else + data << int32(0); } } data.put(petMaskPos, petauramask); // GROUP_UPDATE_FLAG_PET_AURAS @@ -932,9 +1037,15 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recv_data) else { data << uint8(0); // GROUP_UPDATE_FLAG_PET_NAME + data << uint8(1); // GROUP_UPDATE_FLAG_PET_AURAS data << uint64(0); // GROUP_UPDATE_FLAG_PET_AURAS + data << uint32(0); // GROUP_UPDATE_FLAG_PET_AURAS } + data << uint32(8); // GROUP_UPDATE_FLAG_PHASE + data << uint32(0); // GROUP_UPDATE_FLAG_PHASE + data << uint8(0); // GROUP_UPDATE_FLAG_PHASE + SendPacket(&data); } diff --git a/src/game/Opcodes.cpp b/src/game/Opcodes.cpp index 77d481c60..ac6e9ad93 100644 --- a/src/game/Opcodes.cpp +++ b/src/game/Opcodes.cpp @@ -151,24 +151,23 @@ void InitializeOpcodes() OPCODE(CMSG_SET_CONTACT_NOTES, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetContactNotesOpcode ); OPCODE(CMSG_ADD_IGNORE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAddIgnoreOpcode ); OPCODE(CMSG_DEL_IGNORE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleDelIgnoreOpcode ); - //OPCODE(CMSG_GROUP_INVITE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupInviteOpcode ); - //OPCODE(SMSG_GROUP_INVITE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); + OPCODE(CMSG_GROUP_INVITE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupInviteOpcode ); + OPCODE(SMSG_GROUP_INVITE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(CMSG_GROUP_CANCEL, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::Handle_NULL ); //OPCODE(SMSG_GROUP_CANCEL, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - //OPCODE(CMSG_GROUP_ACCEPT, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupAcceptOpcode ); - //OPCODE(CMSG_GROUP_DECLINE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupDeclineOpcode ); - //OPCODE(SMSG_GROUP_DECLINE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); + OPCODE(CMSG_GROUP_INVITE_RESPONSE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupInviteResponseOpcode ); + OPCODE(SMSG_GROUP_DECLINE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(CMSG_GROUP_UNINVITE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupUninviteOpcode ); - //OPCODE(CMSG_GROUP_UNINVITE_GUID, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupUninviteGuidOpcode ); - //OPCODE(SMSG_GROUP_UNINVITE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - //OPCODE(CMSG_GROUP_SET_LEADER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupSetLeaderOpcode ); - //OPCODE(SMSG_GROUP_SET_LEADER, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - //OPCODE(CMSG_LOOT_METHOD, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLootMethodOpcode ); - //OPCODE(CMSG_GROUP_DISBAND, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupDisbandOpcode ); - //OPCODE(SMSG_GROUP_DESTROYED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - //OPCODE(SMSG_GROUP_LIST, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - //OPCODE(SMSG_PARTY_MEMBER_STATS, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - //OPCODE(SMSG_PARTY_COMMAND_RESULT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); + OPCODE(CMSG_GROUP_UNINVITE_GUID, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupUninviteGuidOpcode ); + OPCODE(SMSG_GROUP_UNINVITE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); + OPCODE(CMSG_GROUP_SET_LEADER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupSetLeaderOpcode ); + OPCODE(SMSG_GROUP_SET_LEADER, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); + OPCODE(CMSG_LOOT_METHOD, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLootMethodOpcode ); + OPCODE(CMSG_GROUP_DISBAND, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupDisbandOpcode ); + OPCODE(SMSG_GROUP_DESTROYED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); + OPCODE(SMSG_GROUP_LIST, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); + OPCODE(SMSG_PARTY_MEMBER_STATS, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); + OPCODE(SMSG_PARTY_COMMAND_RESULT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(UMSG_UPDATE_GROUP_MEMBERS, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); //OPCODE(CMSG_GUILD_CREATE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildCreateOpcode ); //OPCODE(CMSG_GUILD_INVITE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildInviteOpcode ); @@ -658,7 +657,7 @@ void InitializeOpcodes() OPCODE(SMSG_SPELLNONMELEEDAMAGELOG, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(CMSG_LEARN_TALENT, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLearnTalentOpcode ); //OPCODE(SMSG_RESURRECT_FAILED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - //OPCODE(CMSG_TOGGLE_PVP, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleTogglePvP ); + OPCODE(CMSG_TOGGLE_PVP, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleTogglePvP ); //OPCODE(SMSG_ZONE_UNDER_ATTACK, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); OPCODE(MSG_AUCTION_HELLO, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionHelloOpcode ); //OPCODE(CMSG_AUCTION_SELL_ITEM, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAuctionSellItem ); @@ -701,15 +700,15 @@ void InitializeOpcodes() OPCODE(SMSG_SPELLDISPELLOG, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(SMSG_DAMAGE_CALC_LOG, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(CMSG_ENABLE_DAMAGE_LOG, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); - //OPCODE(CMSG_GROUP_CHANGE_SUB_GROUP, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupChangeSubGroupOpcode ); - //OPCODE(CMSG_REQUEST_PARTY_MEMBER_STATS, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRequestPartyMemberStatsOpcode); + OPCODE(CMSG_GROUP_CHANGE_SUB_GROUP, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupChangeSubGroupOpcode ); + OPCODE(CMSG_REQUEST_PARTY_MEMBER_STATS, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRequestPartyMemberStatsOpcode); //OPCODE(CMSG_GROUP_SWAP_SUB_GROUP, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL ); //OPCODE(CMSG_RESET_FACTION_CHEAT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); OPCODE(CMSG_AUTOSTORE_BANK_ITEM, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAutoStoreBankItemOpcode ); OPCODE(CMSG_AUTOBANK_ITEM, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleAutoBankItemOpcode ); //OPCODE(MSG_QUERY_NEXT_MAIL_TIME, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleQueryNextMailTime ); //OPCODE(SMSG_RECEIVED_MAIL, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - //OPCODE(SMSG_RAID_GROUP_ONLY, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); + OPCODE(SMSG_RAID_GROUP_ONLY, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(CMSG_SET_DURABILITY_CHEAT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); //OPCODE(CMSG_SET_PVP_RANK_CHEAT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); //OPCODE(CMSG_ADD_PVP_MEDAL_CHEAT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); @@ -717,8 +716,8 @@ void InitializeOpcodes() //OPCODE(CMSG_SET_PVP_TITLE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); //OPCODE(SMSG_PVP_CREDIT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(SMSG_AUCTION_REMOVED_NOTIFICATION, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - //OPCODE(CMSG_GROUP_RAID_CONVERT, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupRaidConvertOpcode ); - //OPCODE(CMSG_GROUP_ASSISTANT_LEADER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupAssistantLeaderOpcode); + OPCODE(CMSG_GROUP_RAID_CONVERT, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupRaidConvertOpcode ); + OPCODE(CMSG_GROUP_ASSISTANT_LEADER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGroupAssistantLeaderOpcode); OPCODE(CMSG_BUYBACK_ITEM, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBuybackItem ); //OPCODE(SMSG_SERVER_MESSAGE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(CMSG_SET_SAVED_INSTANCE_EXTEND, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL ); @@ -815,7 +814,7 @@ void InitializeOpcodes() OPCODE(SMSG_ADDON_INFO, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(CMSG_PET_UNLEARN, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandlePetUnlearnOpcode ); //OPCODE(SMSG_PET_UNLEARN_CONFIRM, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - //OPCODE(SMSG_PARTY_MEMBER_STATS_FULL, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); + OPCODE(SMSG_PARTY_MEMBER_STATS_FULL, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); OPCODE(CMSG_PET_SPELL_AUTOCAST, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandlePetSpellAutocastOpcode ); OPCODE(SMSG_WEATHER, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(SMSG_PLAY_TIME_WARNING, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); @@ -862,8 +861,8 @@ void InitializeOpcodes() //OPCODE(SMSG_INSTANCE_RESET, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(SMSG_INSTANCE_RESET_FAILED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(SMSG_UPDATE_LAST_INSTANCE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - //OPCODE(MSG_RAID_TARGET_UPDATE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRaidTargetUpdateOpcode ); - //OPCODE(MSG_RAID_READY_CHECK, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRaidReadyCheckOpcode ); + OPCODE(MSG_RAID_TARGET_UPDATE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRaidTargetUpdateOpcode ); + OPCODE(MSG_RAID_READY_CHECK, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRaidReadyCheckOpcode ); //OPCODE(CMSG_LUA_USAGE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); //OPCODE(SMSG_PET_ACTION_SOUND, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(SMSG_PET_DISMISS_SOUND, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); @@ -1003,7 +1002,7 @@ void InitializeOpcodes() //OPCODE(CMSG_MOVE_SET_RUN_SPEED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); //OPCODE(SMSG_DISMOUNT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(MSG_MOVE_UPDATE_CAN_FLY, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); - //OPCODE(MSG_RAID_READY_CHECK_CONFIRM, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); + OPCODE(MSG_RAID_READY_CHECK_CONFIRM, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); //OPCODE(CMSG_VOICE_SESSION_ENABLE, STATUS_AUTHED, PROCESS_THREADUNSAFE, &WorldSession::HandleVoiceSessionEnableOpcode ); //OPCODE(SMSG_VOICE_SESSION_ENABLE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); //OPCODE(SMSG_VOICE_PARENTAL_CONTROLS, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); @@ -1027,7 +1026,7 @@ void InitializeOpcodes() //OPCODE(CMSG_CHEAT_PLAYER_LOOKUP, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); //OPCODE(SMSG_CHEAT_PLAYER_LOOKUP, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(SMSG_KICK_REASON, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - //OPCODE(MSG_RAID_READY_CHECK_FINISHED, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRaidReadyCheckFinishedOpcode); + OPCODE(MSG_RAID_READY_CHECK_FINISHED, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRaidReadyCheckFinishedOpcode); //OPCODE(CMSG_COMPLAIN, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleComplainOpcode ); //OPCODE(SMSG_COMPLAIN_RESULT, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); OPCODE(SMSG_FEATURE_SYSTEM_STATUS, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); @@ -1320,7 +1319,7 @@ void InitializeOpcodes() //OPCODE(SMSG_BATTLEFIELD_MANAGER_STATE_CHANGED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(CMSG_BATTLEFIELD_MANAGER_ADVANCE_STATE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); //OPCODE(CMSG_BATTLEFIELD_MANAGER_SET_NEXT_TRANSITION_TIME, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); - //OPCODE(MSG_SET_RAID_DIFFICULTY, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetRaidDifficultyOpcode ); + OPCODE(MSG_SET_RAID_DIFFICULTY, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetRaidDifficultyOpcode ); //OPCODE(CMSG_XPGAIN, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); //OPCODE(SMSG_XPGAIN, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //OPCODE(SMSG_GMTICKET_RESPONSE_ERROR, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h index 54f8b2803..173904e24 100644 --- a/src/game/Opcodes.h +++ b/src/game/Opcodes.h @@ -145,24 +145,23 @@ enum Opcodes CMSG_SET_CONTACT_NOTES = 0x6135, // 4.3.4 15595 CMSG_ADD_IGNORE = 0x4726, // 4.3.4 15595 CMSG_DEL_IGNORE = 0x6D26, // 4.3.4 15595 - CMSG_GROUP_INVITE = 0x106F, - SMSG_GROUP_INVITE = 0x1070, + CMSG_GROUP_INVITE = 0x0513, // 4.3.4 15595 + SMSG_GROUP_INVITE = 0x31B2, // 4.3.4 15595 CMSG_GROUP_CANCEL = 0x1071, SMSG_GROUP_CANCEL = 0x1072, - CMSG_GROUP_ACCEPT = 0x1073, - CMSG_GROUP_DECLINE = 0x1074, - SMSG_GROUP_DECLINE = 0x1075, + CMSG_GROUP_INVITE_RESPONSE = 0x0410, // 4.3.4 15595 + SMSG_GROUP_DECLINE = 0x6835, // 4.3.4 15595 CMSG_GROUP_UNINVITE = 0x1076, - CMSG_GROUP_UNINVITE_GUID = 0x1077, - SMSG_GROUP_UNINVITE = 0x1078, - CMSG_GROUP_SET_LEADER = 0x1079, - SMSG_GROUP_SET_LEADER = 0x107A, - CMSG_LOOT_METHOD = 0x107B, - CMSG_GROUP_DISBAND = 0x107C, - SMSG_GROUP_DESTROYED = 0x107D, - SMSG_GROUP_LIST = 0x107E, - SMSG_PARTY_MEMBER_STATS = 0x107F, - SMSG_PARTY_COMMAND_RESULT = 0x1080, + CMSG_GROUP_UNINVITE_GUID = 0x2E07, // 4.3.4 15595 + SMSG_GROUP_UNINVITE = 0x0A07, // 4.3.4 15595 + CMSG_GROUP_SET_LEADER = 0x4C17, // 4.3.4 15595 + SMSG_GROUP_SET_LEADER = 0x0526, // 4.3.4 15595 + CMSG_LOOT_METHOD = 0x2F24, // 4.3.4 15595 + CMSG_GROUP_DISBAND = 0x2804, // 4.3.4 15595 + SMSG_GROUP_DESTROYED = 0x2207, // 4.3.4 15595 + SMSG_GROUP_LIST = 0x4C24, // 4.3.4 15595 + SMSG_PARTY_MEMBER_STATS = 0x2104, // 4.3.4 15595 + SMSG_PARTY_COMMAND_RESULT = 0x6E07, // 4.3.4 15595 UMSG_UPDATE_GROUP_MEMBERS = 0x1081, CMSG_GUILD_CREATE = 0x1082, CMSG_GUILD_INVITE = 0x1083, @@ -643,7 +642,7 @@ enum Opcodes SMSG_SPELLNONMELEEDAMAGELOG = 0x4315, // 4.3.4 15595 CMSG_LEARN_TALENT = 0x1252, SMSG_RESURRECT_FAILED = 0x1253, - CMSG_TOGGLE_PVP = 0x1254, + CMSG_TOGGLE_PVP = 0x6815, // 4.3.4 15595 SMSG_ZONE_UNDER_ATTACK = 0x1255, MSG_AUCTION_HELLO = 0x2307, // 4.3.4 15595 CMSG_AUCTION_SELL_ITEM = 0x1257, @@ -686,15 +685,15 @@ enum Opcodes SMSG_SPELLDISPELLOG = 0x4516, // 4.3.4 15595 SMSG_DAMAGE_CALC_LOG = 0x127D, CMSG_ENABLE_DAMAGE_LOG = 0x127E, - CMSG_GROUP_CHANGE_SUB_GROUP = 0x127F, - CMSG_REQUEST_PARTY_MEMBER_STATS = 0x1280, + CMSG_GROUP_CHANGE_SUB_GROUP = 0x4124, // 4.3.4 15595 + CMSG_REQUEST_PARTY_MEMBER_STATS = 0x0C04, // 4.3.4 15595 CMSG_GROUP_SWAP_SUB_GROUP = 0x1281, CMSG_RESET_FACTION_CHEAT = 0x1282, CMSG_AUTOSTORE_BANK_ITEM = 0x0607, // 4.3.4 15595 CMSG_AUTOBANK_ITEM = 0x2537, // 4.3.4 15595 MSG_QUERY_NEXT_MAIL_TIME = 0x0F04, // 4.3.4 15595 SMSG_RECEIVED_MAIL = 0x1286, - SMSG_RAID_GROUP_ONLY = 0x1287, + SMSG_RAID_GROUP_ONLY = 0x0837, // 4.3.4 15595 CMSG_SET_DURABILITY_CHEAT = 0x1288, CMSG_SET_PVP_RANK_CHEAT = 0x1289, CMSG_ADD_PVP_MEDAL_CHEAT = 0x128A, @@ -702,8 +701,8 @@ enum Opcodes CMSG_SET_PVP_TITLE = 0x128C, SMSG_PVP_CREDIT = 0x128D, SMSG_AUCTION_REMOVED_NOTIFICATION = 0x128E, - CMSG_GROUP_RAID_CONVERT = 0x128F, - CMSG_GROUP_ASSISTANT_LEADER = 0x1290, + CMSG_GROUP_RAID_CONVERT = 0x6E27, // 4.3.4 15595 + CMSG_GROUP_ASSISTANT_LEADER = 0x6025, // 4.3.4 15595 CMSG_BUYBACK_ITEM = 0x6C17, // 4.3.4 15595 SMSG_SERVER_MESSAGE = 0x1292, CMSG_SET_SAVED_INSTANCE_EXTEND = 0x1293, @@ -800,7 +799,7 @@ enum Opcodes SMSG_ADDON_INFO = 0x2C14, // 4.3.4 15595 CMSG_PET_UNLEARN = 0x12F1, SMSG_PET_UNLEARN_CONFIRM = 0x12F2, - SMSG_PARTY_MEMBER_STATS_FULL = 0x12F3, + SMSG_PARTY_MEMBER_STATS_FULL = 0x0215, // 4.3.4 15595 CMSG_PET_SPELL_AUTOCAST = 0x2514, // 4.3.4 15595 SMSG_WEATHER = 0x2904, // 4.3.4 15595 SMSG_PLAY_TIME_WARNING = 0x12F6, @@ -847,8 +846,8 @@ enum Opcodes SMSG_INSTANCE_RESET = 0x131F, SMSG_INSTANCE_RESET_FAILED = 0x1320, SMSG_UPDATE_LAST_INSTANCE = 0x1321, - MSG_RAID_TARGET_UPDATE = 0x1322, - MSG_RAID_READY_CHECK = 0x1323, + MSG_RAID_TARGET_UPDATE = 0x2C36, // 4.3.4 15595 + MSG_RAID_READY_CHECK = 0x2304, // 4.3.4 15595 CMSG_LUA_USAGE = 0x1324, SMSG_PET_ACTION_SOUND = 0x1325, SMSG_PET_DISMISS_SOUND = 0x1326, @@ -988,7 +987,7 @@ enum Opcodes CMSG_MOVE_SET_RUN_SPEED = 0x13AC, SMSG_DISMOUNT = 0x13AD, MSG_MOVE_UPDATE_CAN_FLY = 0x13AE, - MSG_RAID_READY_CHECK_CONFIRM = 0x13AF, + MSG_RAID_READY_CHECK_CONFIRM = 0x4F05, // 4.3.4 15595 CMSG_VOICE_SESSION_ENABLE = 0x13B0, SMSG_VOICE_SESSION_ENABLE = 0x13B1, SMSG_VOICE_PARENTAL_CONTROLS = 0x13B2, @@ -1012,7 +1011,7 @@ enum Opcodes CMSG_CHEAT_PLAYER_LOOKUP = 0x13C4, SMSG_CHEAT_PLAYER_LOOKUP = 0x13C5, SMSG_KICK_REASON = 0x13C6, - MSG_RAID_READY_CHECK_FINISHED = 0x13C7, + MSG_RAID_READY_CHECK_FINISHED = 0x2E15, // 4.3.4 15595 CMSG_COMPLAIN = 0x13C8, SMSG_COMPLAIN_RESULT = 0x13C9, SMSG_FEATURE_SYSTEM_STATUS = 0x3DB7, // 4.3.4 15595 @@ -1305,7 +1304,7 @@ enum Opcodes SMSG_BATTLEFIELD_MANAGER_STATE_CHANGED = 0x14E9, CMSG_BATTLEFIELD_MANAGER_ADVANCE_STATE = 0x14EA, CMSG_BATTLEFIELD_MANAGER_SET_NEXT_TRANSITION_TIME = 0x14EB, - MSG_SET_RAID_DIFFICULTY = 0x14EC, + MSG_SET_RAID_DIFFICULTY = 0x0614, // 4.3.4 15595 CMSG_XPGAIN = 0x14ED, SMSG_XPGAIN = 0x14EE, SMSG_GMTICKET_RESPONSE_ERROR = 0x14EF, diff --git a/src/game/Unit.h b/src/game/Unit.h index c5e2f6f3b..df3d41041 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -1733,7 +1733,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject VisibleAuraMap::const_iterator itr = m_visibleAuras.find(slot); if (itr != m_visibleAuras.end()) return itr->second; - return 0; + return NULL; } void SetVisibleAura(uint8 slot, SpellAuraHolder* holder) { diff --git a/src/game/WorldSession.h b/src/game/WorldSession.h index dc8c95413..bf42edb27 100644 --- a/src/game/WorldSession.h +++ b/src/game/WorldSession.h @@ -520,8 +520,7 @@ class MANGOS_DLL_SPEC WorldSession void HandleRequestRaidInfoOpcode(WorldPacket& recv_data); void HandleGroupInviteOpcode(WorldPacket& recvPacket); - void HandleGroupAcceptOpcode(WorldPacket& recvPacket); - void HandleGroupDeclineOpcode(WorldPacket& recvPacket); + void HandleGroupInviteResponseOpcode(WorldPacket& recvPacket); void HandleGroupUninviteOpcode(WorldPacket& recvPacket); void HandleGroupUninviteGuidOpcode(WorldPacket& recvPacket); void HandleGroupSetLeaderOpcode(WorldPacket& recvPacket); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index a61a62ba7..cfcf94078 100644 --- 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 "0185" +#define REVISION_NR "0186" #endif // __REVISION_NR_H__