From 08ac6d548f5bedd05de2e5c4e036118209da6579 Mon Sep 17 00:00:00 2001
From: bloodshot <jdroque@gmail.com>
Date: Tue, 26 Aug 2014 20:49:20 -0400
Subject: [PATCH] Allow client handshake to be reset by server to support
 BungeeCord.

---
 .../common/network/handshake/FMLHandshakeClientState.java    | 5 +++++
 .../mods/fml/common/network/handshake/FMLHandshakeCodec.java | 1 +
 .../fml/common/network/handshake/FMLHandshakeMessage.java    | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeClientState.java b/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeClientState.java
index 12ed5f369..1f756f330 100644
--- a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeClientState.java
+++ b/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeClientState.java
@@ -125,6 +125,11 @@ enum FMLHandshakeClientState implements IHandshakeState<FMLHandshakeClientState>
         @Override
         public FMLHandshakeClientState accept(ChannelHandlerContext ctx, FMLHandshakeMessage msg)
         {
+            if (msg instanceof FMLHandshakeMessage.HandshakeReset)
+            {
+                GameData.revertToFrozen();
+                return HELLO;
+            }
             return this;
         }
     },
diff --git a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeCodec.java b/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeCodec.java
index 8ccd3c9f3..e00487601 100644
--- a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeCodec.java
+++ b/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeCodec.java
@@ -12,6 +12,7 @@ public class FMLHandshakeCodec extends FMLIndexedMessageToMessageCodec<FMLHandsh
         addDiscriminator((byte)2, FMLHandshakeMessage.ModList.class);
         addDiscriminator((byte)3, FMLHandshakeMessage.ModIdData.class);
         addDiscriminator((byte)-1, FMLHandshakeMessage.HandshakeAck.class);
+        addDiscriminator((byte)-2, FMLHandshakeMessage.HandshakeReset.class);
     }
     @Override
     public void encodeInto(ChannelHandlerContext ctx, FMLHandshakeMessage msg, ByteBuf target) throws Exception
diff --git a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeMessage.java b/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeMessage.java
index d9987034b..d11933c44 100644
--- a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeMessage.java
+++ b/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeMessage.java
@@ -235,6 +235,9 @@ public abstract class FMLHandshakeMessage {
             return super.toString(side) + ":{"+phase+"}";
         }
     }
+    public static class HandshakeReset extends FMLHandshakeMessage {
+        public HandshakeReset() {}
+    }
     public void fromBytes(ByteBuf buffer)
     {
     }