From de6d56554f6bb9c3c014a434e33a1aa2c093fd28 Mon Sep 17 00:00:00 2001 From: rtm516 Date: Tue, 25 Apr 2023 23:15:53 +0100 Subject: [PATCH] Remove storing packet in memory --- .../java/org/geysermc/connect/extension/PacketHandler.java | 2 +- .../java/org/geysermc/connect/extension/ui/UIHandler.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/geysermc/connect/extension/PacketHandler.java b/src/main/java/org/geysermc/connect/extension/PacketHandler.java index 36ed72d..8c7f227 100644 --- a/src/main/java/org/geysermc/connect/extension/PacketHandler.java +++ b/src/main/java/org/geysermc/connect/extension/PacketHandler.java @@ -79,7 +79,7 @@ public class PacketHandler extends UpstreamPacketHandler { geyserConnect.logger().debug("Player initialized: " + Utils.displayName(session)); - UIHandler uiHandler = new UIHandler(session, packet, originalPacketHandler); + UIHandler uiHandler = new UIHandler(session, originalPacketHandler); uiHandler.initialiseSession(); } } diff --git a/src/main/java/org/geysermc/connect/extension/ui/UIHandler.java b/src/main/java/org/geysermc/connect/extension/ui/UIHandler.java index e9f56f3..b7878b1 100644 --- a/src/main/java/org/geysermc/connect/extension/ui/UIHandler.java +++ b/src/main/java/org/geysermc/connect/extension/ui/UIHandler.java @@ -21,13 +21,10 @@ import java.util.List; public class UIHandler { private final GeyserSession session; - private final SetLocalPlayerAsInitializedPacket initializedPacket; private final BedrockPacketHandler originalPacketHandler; - public UIHandler(GeyserSession session, SetLocalPlayerAsInitializedPacket packet, BedrockPacketHandler originalPacketHandler) { + public UIHandler(GeyserSession session, BedrockPacketHandler originalPacketHandler) { this.session = session; - this.initializedPacket = new SetLocalPlayerAsInitializedPacket(); - this.initializedPacket.setRuntimeEntityId(packet.getRuntimeEntityId()); this.originalPacketHandler = originalPacketHandler; } @@ -53,6 +50,8 @@ public class UIHandler { session.getUpstream().setInitialized(false); // Hand back to core geyser + SetLocalPlayerAsInitializedPacket initializedPacket = new SetLocalPlayerAsInitializedPacket(); + initializedPacket.setRuntimeEntityId(session.getPlayerEntity().getGeyserId()); originalPacketHandler.handle(initializedPacket); } }