From 35ba4bbeecee859bfb9116017ed3af1284e748fc Mon Sep 17 00:00:00 2001 From: MagicBot Date: Fri, 29 Mar 2024 06:26:59 -0400 Subject: [PATCH] CosttoOpenBankMsg has no handler --- src/engine/net/client/ClientMessagePump.java | 9 --------- src/engine/net/client/Protocol.java | 2 +- .../net/client/handlers/VendorDialogMsgHandler.java | 4 ++-- ...{AckBankWindowOpenedMsg.java => CostOpenBankMsg.java} | 6 +++--- 4 files changed, 6 insertions(+), 15 deletions(-) rename src/engine/net/client/msg/{AckBankWindowOpenedMsg.java => CostOpenBankMsg.java} (92%) diff --git a/src/engine/net/client/ClientMessagePump.java b/src/engine/net/client/ClientMessagePump.java index 5afb516d..ef042a6a 100644 --- a/src/engine/net/client/ClientMessagePump.java +++ b/src/engine/net/client/ClientMessagePump.java @@ -48,12 +48,6 @@ public class ClientMessagePump implements NetMsgHandler { this.server = server; } - private static void ackBankWindowOpened(AckBankWindowOpenedMsg msg, ClientConnection origin) { - // According to the Wiki, the client should not send this message. - // Log the instance to investigate, and modify Wiki accordingly. - Logger.error(msg.toString()); - } - // called when player clicks respawn button private static void respawn(RespawnMsg msg, ClientConnection origin) throws MsgSendException { @@ -235,9 +229,6 @@ public class ClientMessagePump implements NetMsgHandler { break; case OPENVAULT: break; - case COSTTOOPENBANK: - ackBankWindowOpened((AckBankWindowOpenedMsg) msg, origin); - break; case RESETAFTERDEATH: respawn((RespawnMsg) msg, origin); break; diff --git a/src/engine/net/client/Protocol.java b/src/engine/net/client/Protocol.java index c0a7d50f..d503dd3f 100644 --- a/src/engine/net/client/Protocol.java +++ b/src/engine/net/client/Protocol.java @@ -81,7 +81,7 @@ public enum Protocol { CLIENTUPDATEVAULT(0x66EDBECD, UpdateVaultMsg.class, null), COMBATMODE(0xFE4BF353, ToggleCombatMsg.class, ToggleCombatMsgHandler.class), //Toggle Combat mode CONFIRMPROMOTE(0x153BB5F9, ConfirmPromoteMsg.class, null), - COSTTOOPENBANK(0x135BE5E8, AckBankWindowOpenedMsg.class, null), // ACK Bank Window Opened + COSTTOOPENBANK(0x135BE5E8, CostOpenBankMsg.class, null), // ACK Bank Window Opened CREATECHAR(0x5D18B5C8, CommitNewCharacterMsg.class, null), // Commit New Character, CREATEPETITION(0xD489CFED, GuildCreationFinalizeMsg.class, GuildCreationFinalizeHandler.class), //Confirm guild creation CUSTOMERPETITION(0x7F9D7D6D, PetitionReceivedMsg.class, PetitionReceivedMsgHandler.class), diff --git a/src/engine/net/client/handlers/VendorDialogMsgHandler.java b/src/engine/net/client/handlers/VendorDialogMsgHandler.java index a4a707c6..3cda342f 100644 --- a/src/engine/net/client/handlers/VendorDialogMsgHandler.java +++ b/src/engine/net/client/handlers/VendorDialogMsgHandler.java @@ -510,9 +510,9 @@ public class VendorDialogMsgHandler extends AbstractClientMsgHandler { // TODO When do we setBankOpen(false)? I don't think the client sends a // "CloseBank" message. - AckBankWindowOpenedMsg ackBankWindowOpenedMsg = new AckBankWindowOpenedMsg(playerCharacter, 0L, 0L); + CostOpenBankMsg costOpenBankMsg = new CostOpenBankMsg(playerCharacter, 0L, 0L); - Dispatch dispatch = Dispatch.borrow(playerCharacter, ackBankWindowOpenedMsg); + Dispatch dispatch = Dispatch.borrow(playerCharacter, costOpenBankMsg); DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY); ReqBankInventoryMsg reqBankInventoryMsg = new ReqBankInventoryMsg(playerCharacter, 0L); diff --git a/src/engine/net/client/msg/AckBankWindowOpenedMsg.java b/src/engine/net/client/msg/CostOpenBankMsg.java similarity index 92% rename from src/engine/net/client/msg/AckBankWindowOpenedMsg.java rename to src/engine/net/client/msg/CostOpenBankMsg.java index c3a98d35..e854f7dc 100644 --- a/src/engine/net/client/msg/AckBankWindowOpenedMsg.java +++ b/src/engine/net/client/msg/CostOpenBankMsg.java @@ -22,7 +22,7 @@ import engine.objects.PlayerCharacter; * * @author Burfo */ -public class AckBankWindowOpenedMsg extends ClientNetMsg { +public class CostOpenBankMsg extends ClientNetMsg { private int playerType; private int playerID; @@ -32,7 +32,7 @@ public class AckBankWindowOpenedMsg extends ClientNetMsg { /** * This is the general purpose constructor. */ - public AckBankWindowOpenedMsg(PlayerCharacter pc, long unknown01, long unknown02) { + public CostOpenBankMsg(PlayerCharacter pc, long unknown01, long unknown02) { super(Protocol.COSTTOOPENBANK); this.playerType = pc.getObjectType().ordinal(); this.playerID = pc.getObjectUUID(); @@ -46,7 +46,7 @@ public class AckBankWindowOpenedMsg extends ClientNetMsg { * past the limit) then this constructor Throws that Exception to the * caller. */ - public AckBankWindowOpenedMsg(AbstractConnection origin, ByteBufferReader reader) { + public CostOpenBankMsg(AbstractConnection origin, ByteBufferReader reader) { super(Protocol.COSTTOOPENBANK, origin, reader); }