From b6767e2a8af1a10bfa425e3d82d4683acbe56677 Mon Sep 17 00:00:00 2001 From: Olion Date: Sat, 1 Jul 2017 10:34:47 +0300 Subject: [PATCH] SMSG_TRANSFER_ABORTED has no data except uint8 TransferAbortReason --- src/game/Object/Player.h | 3 +-- src/game/Server/Opcodes.cpp | 2 +- src/game/Server/WorldSession.cpp | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/game/Object/Player.h b/src/game/Object/Player.h index ab2afe9d..90cf016d 100644 --- a/src/game/Object/Player.h +++ b/src/game/Object/Player.h @@ -602,13 +602,12 @@ enum TradeSlots TRADE_SLOT_NONTRADED = 6 }; -// [-ZERO] Need fix, or maybe not exists enum TransferAbortReason { - TRANSFER_ABORT_NONE = 0x00, TRANSFER_ABORT_MAX_PLAYERS = 0x01, // Transfer Aborted: instance is full TRANSFER_ABORT_NOT_FOUND = 0x02, // Transfer Aborted: instance not found TRANSFER_ABORT_TOO_MANY_INSTANCES = 0x03, // You have entered too many instances recently. + TRANSFER_ABORT_SILENTLY = 0x04, // no message shown; the same effect give values above 5 TRANSFER_ABORT_ZONE_IN_COMBAT = 0x05, // Unable to zone in while an encounter is in progress. }; diff --git a/src/game/Server/Opcodes.cpp b/src/game/Server/Opcodes.cpp index 2f003907..907d5ae8 100644 --- a/src/game/Server/Opcodes.cpp +++ b/src/game/Server/Opcodes.cpp @@ -124,7 +124,7 @@ void Opcodes::BuildOpcodeList() /*0x03D*/ StoreOpcode(CMSG_PLAYER_LOGIN, "CMSG_PLAYER_LOGIN", STATUS_AUTHED, PROCESS_INPLACE, &WorldSession::HandlePlayerLoginOpcode); /*[-ZERO] Need check */ /*0x03E*/ StoreOpcode(SMSG_NEW_WORLD, "SMSG_NEW_WORLD", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*[-ZERO] Need check */ /*0x03F*/ StoreOpcode(SMSG_TRANSFER_PENDING, "SMSG_TRANSFER_PENDING", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); - /*[-ZERO] Need check */ /*0x040*/ StoreOpcode(SMSG_TRANSFER_ABORTED, "SMSG_TRANSFER_ABORTED", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); + /*0x040*/ StoreOpcode(SMSG_TRANSFER_ABORTED, "SMSG_TRANSFER_ABORTED", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*[-ZERO] Need check */ /*0x041*/ StoreOpcode(SMSG_CHARACTER_LOGIN_FAILED, "SMSG_CHARACTER_LOGIN_FAILED", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*[-ZERO] Need check */ /*0x042*/ StoreOpcode(SMSG_LOGIN_SETTIMESPEED, "SMSG_LOGIN_SETTIMESPEED", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*[-ZERO] Need check */ /*0x043*/ StoreOpcode(SMSG_GAMETIME_UPDATE, "SMSG_GAMETIME_UPDATE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); diff --git a/src/game/Server/WorldSession.cpp b/src/game/Server/WorldSession.cpp index c89708a8..7dac04d5 100644 --- a/src/game/Server/WorldSession.cpp +++ b/src/game/Server/WorldSession.cpp @@ -780,10 +780,8 @@ void WorldSession::SaveTutorialsData() // Send chat information about aborted transfer (mostly used by Player::SendTransferAbortedByLockstatus()) void WorldSession::SendTransferAborted(uint32 mapid, uint8 reason, uint8 arg) { - WorldPacket data(SMSG_TRANSFER_ABORTED, 4 + 2); - data << uint32(mapid); + WorldPacket data(SMSG_TRANSFER_ABORTED, 1); data << uint8(reason); // transfer abort reason - data << uint8(0); // arg. not used SendPacket(&data); }