From 89acec994ade691fc16cddf21c3324fde93d435b Mon Sep 17 00:00:00 2001 From: Melledy <121644117+Melledy@users.noreply.github.com> Date: Wed, 29 Nov 2023 23:03:29 -0800 Subject: [PATCH] Update base packet class again --- src/main/java/emu/lunarcore/server/game/GameSession.java | 6 +++--- src/main/java/emu/lunarcore/server/packet/BasePacket.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/emu/lunarcore/server/game/GameSession.java b/src/main/java/emu/lunarcore/server/game/GameSession.java index 33b289b..8c4c34f 100644 --- a/src/main/java/emu/lunarcore/server/game/GameSession.java +++ b/src/main/java/emu/lunarcore/server/game/GameSession.java @@ -146,7 +146,7 @@ public class GameSession { public void send(BasePacket packet) { // Test - if (packet.getOpcode() <= 0) { + if (packet.getCmdId() <= 0) { LunarCore.getLogger().warn("Tried to send packet with missing cmd id!"); return; } @@ -156,11 +156,11 @@ public class GameSession { // Log if (LunarCore.getConfig().getLogOptions().packets) { - if (LunarCore.getConfig().getLogOptions().filterLoopingPackets && CmdIdUtils.LOOP_PACKETS.contains(packet.getOpcode())) { + if (LunarCore.getConfig().getLogOptions().filterLoopingPackets && CmdIdUtils.LOOP_PACKETS.contains(packet.getCmdId())) { return; } - logPacket("SEND", packet.getOpcode(), packet.getData()); + logPacket("SEND", packet.getCmdId(), packet.getData()); } } diff --git a/src/main/java/emu/lunarcore/server/packet/BasePacket.java b/src/main/java/emu/lunarcore/server/packet/BasePacket.java index 585ef9a..50e85f9 100644 --- a/src/main/java/emu/lunarcore/server/packet/BasePacket.java +++ b/src/main/java/emu/lunarcore/server/packet/BasePacket.java @@ -23,8 +23,8 @@ public class BasePacket { this.data = data; } - public void setOpcode(int opcode) { - this.cmdId = opcode; + public void setCmdId(int cmdId) { + this.cmdId = cmdId; } public void setData(byte[] data) {