experimentally dodge configure mode issues?

DenizenScript · Sep 21, 2023 · ab46b3c · ab46b3c
1 parent c96353a
commit ab46b3c
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/.../com/denizenscript/denizen/nms/v1_20/impl/network/handlers/DenizenNetworkManagerImpl.java b/.../com/denizenscript/denizen/nms/v1_20/impl/network/handlers/DenizenNetworkManagerImpl.java
@@ -17,6 +17,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.PacketFlow;
+import net.minecraft.network.protocol.configuration.ServerConfigurationPacketListener;
 import net.minecraft.network.protocol.game.*;
 import net.minecraft.network.protocol.handshake.ClientIntent;
 import net.minecraft.network.protocol.login.ClientLoginPacketListener;
@@ -88,9 +89,16 @@ public DenizenNetworkManagerImpl(ServerPlayer entityPlayer, Connection oldManage
         super(getProtocolDirection(oldManager));
         this.oldManager = oldManager;
         this.channel = oldManager.channel;
-        this.packetListener = (DenizenPacketListenerImpl) NetworkInterceptCodeGen.generateAppropriateInterceptor(this, entityPlayer, DenizenPacketListenerImpl.class, AbstractListenerPlayInImpl.class, ServerGamePacketListenerImpl.class);
-        oldManager.setListener(packetListener);
-        this.player = this.packetListener.player;
+        this.player = entityPlayer;
+        packetListener = (DenizenPacketListenerImpl) NetworkInterceptCodeGen.generateAppropriateInterceptor(this, entityPlayer, DenizenPacketListenerImpl.class, AbstractListenerPlayInImpl.class, ServerGamePacketListenerImpl.class);
+        if (!(oldManager.getPacketListener() instanceof ServerConfigurationPacketListener)) {
+            setListener(packetListener);
+        }
+    }
+
+    @Override
+    public void setListener(PacketListener listener) {
+        oldManager.setListener(listener instanceof ServerConfigurationPacketListener || packetListener == null ? listener : packetListener);
     }
 
     public static Connection getConnection(ServerPlayer player) {