Only inject channels when server protocol is known #631

bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/BukkitChannelInitializer.java

@@ -7,6 +7,7 @@ import io.netty.handler.codec.ByteToMessageDecoder;
 import io.netty.handler.codec.MessageToByteEncoder;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.protocol.ProtocolPipeline;
+import us.myles.ViaVersion.api.protocol.ProtocolRegistry;
 import us.myles.ViaVersion.bukkit.classgenerator.ClassGenerator;
 import us.myles.ViaVersion.bukkit.classgenerator.HandlerConstructor;
 
@@ -33,6 +34,8 @@ public class BukkitChannelInitializer extends ChannelInitializer<SocketChannel>
 
     @Override
     protected void initChannel(SocketChannel socketChannel) throws Exception {
+        // Ensure ViaVersion is loaded
+        if (ProtocolRegistry.SERVER_PROTOCOL != -1) {
             UserConnection info = new UserConnection(socketChannel);
             // init protocol
             new ProtocolPipeline(info);
@@ -48,5 +51,8 @@ public class BukkitChannelInitializer extends ChannelInitializer<SocketChannel>
             socketChannel.pipeline().replace("encoder", "encoder", encoder);
             socketChannel.pipeline().replace("decoder", "decoder", decoder);
             socketChannel.pipeline().addAfter("packet_handler", "viaversion_packet_handler", chunkHandler);
+        } else {
+            this.method.invoke(this.original, socketChannel);
+        }
     }
 }

sponge/src/main/java/us/myles/ViaVersion/sponge/handlers/SpongeChannelInitializer.java

@@ -7,6 +7,7 @@ import io.netty.handler.codec.ByteToMessageDecoder;
 import io.netty.handler.codec.MessageToByteEncoder;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.protocol.ProtocolPipeline;
+import us.myles.ViaVersion.api.protocol.ProtocolRegistry;
 
 import java.lang.reflect.Method;
 
@@ -31,6 +32,8 @@ public class SpongeChannelInitializer extends ChannelInitializer<SocketChannel>
 
     @Override
     protected void initChannel(SocketChannel socketChannel) throws Exception {
+        // Ensure ViaVersion is loaded
+        if (ProtocolRegistry.SERVER_PROTOCOL != -1) {
             UserConnection info = new UserConnection(socketChannel);
             // init protocol
             new ProtocolPipeline(info);
@@ -44,5 +47,8 @@ public class SpongeChannelInitializer extends ChannelInitializer<SocketChannel>
             socketChannel.pipeline().replace("encoder", "encoder", encoder);
             socketChannel.pipeline().replace("decoder", "decoder", decoder);
             socketChannel.pipeline().addAfter("packet_handler", "viaversion_packet_handler", chunkHandler);
+        } else {
+            this.method.invoke(this.original, socketChannel);
+        }
     }
 }