Merge branch 'master' into dev

LICENSE

@@ -3,7 +3,7 @@ License:
 
 MIT License
 
-Copyright (c) 2016
+Copyright (c) 2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

common/src/main/java/us/myles/ViaVersion/ViaManager.java

@@ -46,6 +46,8 @@ public class ViaManager {
         // Check for updates
         if (platform.getConf().isCheckForUpdates())
             UpdateUtil.sendUpdateMessage();
+        // Force class load
+        ProtocolRegistry.getSupportedVersions();
         // Inject
         try {
             injector.inject();

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);
+        }
     }
 }