Merge branch 'master' into apiv2

src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java

@@ -181,7 +181,6 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
                 getLogger().warning("We failed to find the ServerConnection? :( What server are you running?");
                 return;
             }
-            if (connection != null) {
             for (Field field : connection.getClass().getDeclaredFields()) {
                 field.setAccessible(true);
                 final Object value = field.get(connection);
@@ -210,7 +209,6 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
                     }
                 }
             }
-            }
             System.setProperty("ViaVersion", getDescription().getVersion());
         } catch (Exception e) {
             getLogger().severe("Unable to inject handlers, are you on 1.8? ");

src/main/java/us/myles/ViaVersion/handlers/ViaDecodeHandler.java

@@ -54,10 +54,12 @@ public class ViaDecodeHandler extends ByteToMessageDecoder {
                     throw (Exception) e.getCause();
                 }
             } finally {
+                if (info.isActive()) {
                     bytebuf.release();
                 }
             }
         }
+    }
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {