From f92b7e5b80775fbc14e5e2202d8f1296e4179a7d Mon Sep 17 00:00:00 2001
From: Max Qian <public@maxqia.com>
Date: Mon, 17 Oct 2016 19:00:21 -0700
Subject: [PATCH] Tell ProtocolSupport to decode MINECRAFT_FUTURE packets using
 the default decoder (for 1.9.4)

---
 .../bukkit/classgenerator/ClassGenerator.java | 25 ++++++++++++++-----
 .../bukkit/handlers/BukkitEncodeHandler.java  |  2 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/classgenerator/ClassGenerator.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/classgenerator/ClassGenerator.java
index ea4137a0a..24c07b2e8 100644
--- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/classgenerator/ClassGenerator.java
+++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/classgenerator/ClassGenerator.java
@@ -3,12 +3,16 @@ package us.myles.ViaVersion.bukkit.classgenerator;
 import javassist.*;
 import javassist.expr.ConstructorCall;
 import javassist.expr.ExprEditor;
+
+import java.lang.reflect.InvocationTargetException;
+
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;
 import us.myles.ViaVersion.api.ViaVersion;
 import us.myles.ViaVersion.bukkit.handlers.BukkitDecodeHandler;
 import us.myles.ViaVersion.bukkit.handlers.BukkitEncodeHandler;
 import us.myles.ViaVersion.bukkit.util.NMSUtil;
+import us.myles.ViaVersion.handlers.ViaHandler;
 
 public class ClassGenerator {
     private static HandlerConstructor constructor = new BasicHandlerConstructor();
@@ -124,16 +128,25 @@ public class ClassGenerator {
                 if (superclass.getName().endsWith("Decoder")) {
                     // Decoder
                     generated.addMethod(CtMethod.make("public void setRealDecoder(IPacketDecoder dec) {\n" +
-                            "        WrappedDecoder decoder = new WrappedDecoder();" +
-                            "        decoder.setRealDecoder(dec);\n" +
-                            "        this.minecraftDecoder = decoder;\n" +
+                            "        ((WrappedDecoder) this.minecraftDecoder).setRealDecoder(dec);\n" +
                             "    }", generated));
                 } else {
                     // Encoder
+                    pool.importPackage("protocolsupport.api");
+                    pool.importPackage("java.lang.reflect");
                     generated.addMethod(CtMethod.make("public void setRealEncoder(IPacketEncoder enc) {\n" +
-                            "        WrappedEncoder encoder = new WrappedEncoder();" +
-                            "        encoder.setRealEncoder(enc);\n" +
-                            "        this.minecraftEncoder = encoder;\n" +
+                            "         try {\n" +
+                                          // Tell ProtocolSupport to decode MINECRAFT_FUTURE packets using the default decoder (for 1.9.4)
+                            "             Field field = enc.getClass().getDeclaredField(\"version\");\n" +
+                            "             field.setAccessible(true);\n" +
+                            "             ProtocolVersion version = (ProtocolVersion) field.get(enc);\n" +
+
+                            "             if (version == ProtocolVersion.MINECRAFT_FUTURE) enc = enc.getClass().getConstructor(\n" +
+                            "                 new Class[]{ProtocolVersion.class}).newInstance(new Object[] {ProtocolVersion.getLatest()});\n" +
+                            "         } catch (Exception e) {\n" +
+                                          // I guess we're not on 1.9.4
+                            "         }\n" +
+                            "        ((WrappedEncoder) this.minecraftEncoder).setRealEncoder(enc);\n" +
                             "    }", generated));
                 }
             }
diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/BukkitEncodeHandler.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/BukkitEncodeHandler.java
index e51e3e36c..c148d6b53 100644
--- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/BukkitEncodeHandler.java
+++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/BukkitEncodeHandler.java
@@ -58,7 +58,7 @@ public class BukkitEncodeHandler extends MessageToByteEncoder implements ViaHand
 
     public void transform(ByteBuf bytebuf) throws Exception {
         if (bytebuf.readableBytes() == 0) {
-            throw new CancelException();
+            return; // Someone Already Decoded It!
         }
         // Increment sent
         info.incrementSent();