Changes to ensure GeyserConnect still works despite internal changes in

GeyserMC/Geyser#4604 (#83)
GeyserMC · May 10, 2024 · 9733781 · 9733781
1 parent 1c8c038
commit 9733781
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/src/main/java/org/geysermc/extension/connect/GeyserConnect.java b/src/main/java/org/geysermc/extension/connect/GeyserConnect.java
@@ -119,6 +119,11 @@ public void onPostInitialize(GeyserPostInitializeEvent event) {
     @Subscribe
     public void onSessionInitialize(SessionInitializeEvent event) {
         GeyserSession session = (GeyserSession) event.connection();
+        if (config().hardPlayerLimit()) {
+            if (session.getGeyser().getSessionManager().size() >= session.getGeyser().getConfig().getMaxPlayers()) {
+                session.disconnect("disconnectionScreen.serverFull");
+            }
+        }
 
         // Change the packet handler to our own
         BedrockPacketHandler packetHandler = session.getUpstream().getSession().getPacketHandler();

diff --git a/src/main/java/org/geysermc/extension/connect/PacketHandler.java b/src/main/java/org/geysermc/extension/connect/PacketHandler.java
@@ -27,8 +27,9 @@
 
 import org.cloudburstmc.protocol.bedrock.data.AttributeData;
 import org.cloudburstmc.protocol.bedrock.packet.BedrockPacketHandler;
-import org.cloudburstmc.protocol.bedrock.packet.LoginPacket;
 import org.cloudburstmc.protocol.bedrock.packet.NetworkStackLatencyPacket;
+import org.cloudburstmc.protocol.bedrock.packet.ResourcePackChunkRequestPacket;
+import org.cloudburstmc.protocol.bedrock.packet.ResourcePackClientResponsePacket;
 import org.cloudburstmc.protocol.bedrock.packet.SetLocalPlayerAsInitializedPacket;
 import org.cloudburstmc.protocol.bedrock.packet.UpdateAttributesPacket;
 import org.cloudburstmc.protocol.common.PacketSignal;
@@ -74,19 +75,6 @@ public void onDisconnect(String reason) {
         }
     }
 
-    @Override
-    public PacketSignal handle(LoginPacket loginPacket) {
-        // Check to see if the server is full and we have a hard player cap
-        if (geyserConnect.config().hardPlayerLimit()) {
-            if (session.getGeyser().getSessionManager().size() >= session.getGeyser().getConfig().getMaxPlayers()) {
-                session.disconnect("disconnectionScreen.serverFull");
-                return PacketSignal.HANDLED;
-            }
-        }
-
-        return super.handle(loginPacket);
-    }
-
     @Override
     public PacketSignal handle(SetLocalPlayerAsInitializedPacket packet) {
         geyserConnect.logger().debug("Player initialized: " + Utils.displayName(session));
@@ -165,5 +153,15 @@ public PacketSignal handle(NetworkStackLatencyPacket packet) {
 
         return super.handle(packet);
     }
+
+    @Override
+    public PacketSignal handle(ResourcePackClientResponsePacket packet) {
+        return originalPacketHandler.handle(packet);
+    }
+
+    @Override
+    public PacketSignal handle(ResourcePackChunkRequestPacket packet) {
+        return originalPacketHandler.handle(packet);
+    }
 }