diff options
| -rwxr-xr-x | src/server/game/Server/Protocol/Handlers/GroupHandler.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Server/Protocol/Opcodes.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Server/Protocol/Opcodes.h | 14 |
3 files changed, 9 insertions, 11 deletions
diff --git a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp index 03c213b9bd3..27ab91e4941 100755 --- a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp @@ -683,7 +683,7 @@ void WorldSession::HandlePartyAssignmentOpcode(WorldPacket & recv_data) void WorldSession::HandleRaidReadyCheckOpcode(WorldPacket & recv_data) { - sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received MSG_RAID_READY_CHECK"); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received SMSG_RAID_READY_CHECK"); Group* group = GetPlayer()->GetGroup(); if (!group) @@ -697,7 +697,7 @@ void WorldSession::HandleRaidReadyCheckOpcode(WorldPacket & recv_data) /********************/ // everything's fine, do it - WorldPacket data(MSG_RAID_READY_CHECK, 8); + WorldPacket data(SMSG_RAID_READY_CHECK, 8); data << GetPlayer()->GetGUID(); group->BroadcastPacket(&data, false, -1); diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index b6cd0dc4cae..209099a3c7f 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -863,7 +863,7 @@ void InitOpcodes() //DEFINE_OPCODE_HANDLER(SMSG_INSTANCE_RESET_FAILED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); DEFINE_OPCODE_HANDLER(SMSG_UPDATE_LAST_INSTANCE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); //DEFINE_OPCODE_HANDLER(MSG_RAID_TARGET_UPDATE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRaidTargetUpdateOpcode ); - DEFINE_OPCODE_HANDLER(MSG_RAID_READY_CHECK, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRaidReadyCheckOpcode ); + DEFINE_OPCODE_HANDLER(SMSG_RAID_READY_CHECK, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleRaidReadyCheckOpcode ); //DEFINE_OPCODE_HANDLER(CMSG_LUA_USAGE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL ); DEFINE_OPCODE_HANDLER(SMSG_PET_ACTION_SOUND, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); DEFINE_OPCODE_HANDLER(SMSG_PET_DISMISS_SOUND, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index 0d05d924580..682e23359ed 100755 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -352,7 +352,7 @@ enum Opcodes CMSG_QUEST_POI_QUERY = 0x12A5, CMSG_QUEST_QUERY = 0xCE7F, CMSG_QUESTGIVER_ACCEPT_QUEST = 0x0C63, - CMSG_QUESTGIVER_CANCEL = 0xC86A, + CMSG_QUESTGIVER_CANCEL = 0x0000, CMSG_QUESTGIVER_CHOOSE_REWARD = 0x18F3, CMSG_QUESTGIVER_COMPLETE_QUEST = 0xCCE3, CMSG_QUESTGIVER_HELLO = 0xC86A, @@ -378,7 +378,6 @@ enum Opcodes CMSG_REQUEST_CEMETERY_LIST = 0x00, CMSG_REQUEST_PARTY_MEMBER_STATS = 0x987E, CMSG_REQUEST_PET_INFO = 0x9A47, - CMSG_REQUEST_PLAYER_VEHICLE_EXIT = 0xCC6, CMSG_REQUEST_RAID_INFO = 0xECF, CMSG_REQUEST_RATED_BG_INFO = 0x00, CMSG_REQUEST_VEHICLE_EXIT = 0xCC6, @@ -522,8 +521,7 @@ enum Opcodes MSG_QUERY_GUILD_BANK_TEXT = 0x00, MSG_QUERY_NEXT_MAIL_TIME = 0xCEE6, MSG_QUEST_PUSH_RESULT = 0x1863, - MSG_RAID_READY_CHECK = 0x584E, - MSG_RAID_READY_CHECK_CONFIRM = 0x584E, + MSG_RAID_READY_CHECK_CONFIRM = 0x0000, MSG_RAID_READY_CHECK_FINISHED = 0x00, MSG_RAID_TARGET_UPDATE = 0x00, MSG_RANDOM_ROLL = 0x4C57, @@ -531,7 +529,7 @@ enum Opcodes MSG_SET_DUNGEON_DIFFICULTY = 0x0C4F, MSG_SET_RAID_DIFFICULTY = 0x1A5A, MSG_TABARDVENDOR_ACTIVATE = 0x98EB, - MSG_TALENT_WIPE_CONFIRM = 0x4C52, + MSG_TALENT_WIPE_CONFIRM = 0x4C52, //duplicate of CMSG_VERIFY_CONNECTIVITY_RESPONSE OBSOLETE_DROP_ITEM = 0x00, SMSG_ACCOUNT_DATA_TIMES = 0x5EE2, SMSG_ACHIEVEMENT_DELETED = 0x9ED2, @@ -586,7 +584,7 @@ enum Opcodes SMSG_BATTLEFIELD_PORT_DENIED = 0x00, SMSG_BATTLEFIELD_STATUS = 0x00, SMSG_BATTLEFIELD_STATUS1 = 0x70EE, - SMSG_BATTLEFIELD_STATUS2 = 0x20DC, + SMSG_BATTLEFIELD_STATUS2 = 0x0000, SMSG_BATTLEFIELD_STATUS3 = 0x36DE, SMSG_BATTLEFIELD_STATUS4 = 0x626E, SMSG_BATTLEGROUND_INFO_THROTTLED = 0x00, @@ -706,7 +704,7 @@ enum Opcodes SMSG_GROUP_DECLINE = 0x0863, SMSG_GROUP_DESTROYED = 0x00, SMSG_GROUP_INVITE = 0x00, - SMSG_GROUP_JOINED_BATTLEGROUND = 0x265C, + SMSG_GROUP_JOINED_BATTLEGROUND = 0x0000, SMSG_GROUP_LIST = 0x5C7E, SMSG_GROUP_SET_LEADER = 0xCCF2, SMSG_GROUP_UNINVITE = 0x00, @@ -868,7 +866,6 @@ enum Opcodes SMSG_MOVE_UNSET_CAN_FLY = 0xA24C, //forced, for self SMSG_MOVE_UNSET_HOVERING = 0x325E, //forced, for self SMSG_MOVE_UNSET_WALK_IN_AIR = 0x00, - SMSG_MOVE_UPDATE = 0xF66C, SMSG_MOVE_UPDATE_KNOCK_BACK = 0x725C, SMSG_MOVE_UPDATE_TELEPORT = 0xF6DC, SMSG_MULTIPLE_PACKETS = 0xDCEA, @@ -955,6 +952,7 @@ enum Opcodes SMSG_RAID_GROUP_ONLY = 0xDCDB, SMSG_RAID_INSTANCE_INFO = 0x4ACA, SMSG_RAID_INSTANCE_MESSAGE = 0xD862, + SMSG_RAID_READY_CHECK = 0x584E, SMSG_RANDOMIZE_CHAR_NAME = 0xF0DC, SMSG_READ_ITEM_FAILED = 0x0C5B, SMSG_READ_ITEM_OK = 0x9ECE, |