Fixing BungeeCord implementation (how did this even work before?!?!?)

Author: Exceptionflug

protocolize-bungeecord/src/main/java/dev/simplix/protocolize/bungee/netty/ProtocolizeDecoderChannelHandler.java

@@ -20,6 +20,7 @@
 import net.md_5.bungee.protocol.ProtocolConstants.Direction;
 
 import java.nio.channels.ClosedChannelException;
+import java.sql.Ref;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.logging.Level;
@@ -38,7 +39,7 @@ public final class ProtocolizeDecoderChannelHandler extends MessageToMessageDeco
 
     public ProtocolizeDecoderChannelHandler(AbstractPacketHandler abstractPacketHandler, dev.simplix.protocolize.api.Direction streamDirection) {
         this.abstractPacketHandler = abstractPacketHandler;
-        connection = ReflectionUtil.getConnection(abstractPacketHandler, ReflectionUtil.serverConnectorClass.isInstance(abstractPacketHandler));
+        connection = ReflectionUtil.getConnection(abstractPacketHandler, ReflectionUtil.downstreamBridgeClass.isInstance(abstractPacketHandler));
         this.streamDirection = streamDirection;
         try {
             if (ReflectionUtil.isServerConnector(abstractPacketHandler)) {
@@ -55,12 +56,14 @@ public ProtocolizeDecoderChannelHandler(AbstractPacketHandler abstractPacketHand
                     final MinecraftDecoder minecraftDecoder = channel.pipeline().get(MinecraftDecoder.class);
                     protocolVersion = (int) ReflectionUtil.protocolVersionField.get(minecraftDecoder);
                     protocol = (Protocol) ReflectionUtil.protocolField.get(minecraftDecoder);
-                } else {
-                    final Object ch = ReflectionUtil.userConnectionChannelWrapperField.get(abstractPacketHandler);
+                } else if (ReflectionUtil.downstreamBridgeClass.isInstance(abstractPacketHandler)) {
+                    final Object ch = ReflectionUtil.userConnectionChannelWrapperField.get(connection);
                     final Channel channel = (Channel) ReflectionUtil.channelWrapperChannelField.get(ch);
                     final MinecraftDecoder minecraftDecoder = channel.pipeline().get(MinecraftDecoder.class);
                     protocolVersion = (int) ReflectionUtil.protocolVersionField.get(minecraftDecoder);
                     protocol = (Protocol) ReflectionUtil.protocolField.get(minecraftDecoder);
+                } else {
+                    throw new IllegalStateException("Unsupported packet handler: " + abstractPacketHandler.getClass().getName());
                 }
                 direction = Direction.TO_SERVER;
             }

protocolize-bungeecord/src/main/java/dev/simplix/protocolize/bungee/providers/BungeeCordPacketListenerProvider.java

@@ -85,7 +85,7 @@ public DefinedPacket handleOutboundPacket(DefinedPacket packet, AbstractPacketHa
             apiPacket = packet;
         }
         List<AbstractPacketListener<?>> listeners = listenersForType(clazz);
-        boolean sentToServer = ReflectionUtil.serverConnectorClass.isInstance(abstractPacketHandler);
+        boolean sentToServer = ReflectionUtil.downstreamBridgeClass.isInstance(abstractPacketHandler);
         Connection connection = ReflectionUtil.getConnection(abstractPacketHandler, sentToServer);
         if (connection == null) {
             return packet;
@@ -137,7 +137,7 @@ public Map.Entry<DefinedPacket, Boolean> handleInboundPacket(DefinedPacket packe
             apiPacket = packet;
         }
         List<AbstractPacketListener<?>> listeners = listenersForType(clazz);
-        final boolean sentByServer = ReflectionUtil.serverConnectorClass.isInstance(abstractPacketHandler);
+        final boolean sentByServer = ReflectionUtil.downstreamBridgeClass.isInstance(abstractPacketHandler);
         final Connection connection = ReflectionUtil.getConnection(abstractPacketHandler, sentByServer);
         if (connection == null) {
             return null;