diff --git a/Waterfall b/Waterfall
index 1d3fae9..49ea630 160000
--- a/Waterfall
+++ b/Waterfall
@@ -1 +1 @@
-Subproject commit 1d3fae9d1dacd7e271a8417f7765cea8d2e004d5
+Subproject commit 49ea630d4611ea314e2d178a9b60d8c872045993
diff --git a/Waterfall-Proxy-Patches/0004-Fixup-ProtocolConstants.patch b/Waterfall-Proxy-Patches/0004-Fixup-ProtocolConstants.patch
index c749521..3cfb7ad 100644
--- a/Waterfall-Proxy-Patches/0004-Fixup-ProtocolConstants.patch
+++ b/Waterfall-Proxy-Patches/0004-Fixup-ProtocolConstants.patch
@@ -1,14 +1,14 @@
-From 30402ae45a5034a5b6f1b4cfccc28fd3da1f139f Mon Sep 17 00:00:00 2001
+From 97f3d1f3a718027385ab50bc0a5e6ad9d46ff02f Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Tue, 15 Nov 2016 09:07:51 -0500
 Subject: [PATCH] Fixup ProtocolConstants
 
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
-index c59e11cf..9c367d3a 100644
+index b2dc9423..c23b1947 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
-@@ -27,7 +27,8 @@ public class ProtocolConstants
+@@ -26,7 +26,8 @@ public class ProtocolConstants
              "1.12.x",
              "1.13.x"
      );
@@ -18,8 +18,8 @@ index c59e11cf..9c367d3a 100644
              ProtocolConstants.MINECRAFT_1_9,
              ProtocolConstants.MINECRAFT_1_9_1,
              ProtocolConstants.MINECRAFT_1_9_2,
-@@ -42,6 +43,16 @@ public class ProtocolConstants
-             ProtocolConstants.MINECRAFT_1_13_R
+@@ -40,6 +41,16 @@ public class ProtocolConstants
+             ProtocolConstants.MINECRAFT_1_13
      );
  
 +    public static final boolean isBeforeOrEq(int before, int other)
diff --git a/Waterfall-Proxy-Patches/0005-1.7.x-Protocol-Patch.patch b/Waterfall-Proxy-Patches/0005-1.7.x-Protocol-Patch.patch
index 56b3105..b335d8f 100644
--- a/Waterfall-Proxy-Patches/0005-1.7.x-Protocol-Patch.patch
+++ b/Waterfall-Proxy-Patches/0005-1.7.x-Protocol-Patch.patch
@@ -1,4 +1,4 @@
-From 0ce3965eb3bdef827e33d840929d92e219434a0f Mon Sep 17 00:00:00 2001
+From 87e63f220acbb75c3420d9f6ab377f5b76083950 Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Tue, 15 Nov 2016 10:31:04 -0500
 Subject: [PATCH] 1.7.x Protocol Patch
@@ -167,10 +167,10 @@ index d4b03843..9aac7ca9 100644
      }
  }
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-index c08398b1..e28788e5 100644
+index a248c7db..b5a829d9 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-@@ -392,6 +392,8 @@ public enum Protocol
+@@ -378,6 +378,8 @@ public enum Protocol
          private final TIntObjectMap<List<Integer>> linkedProtocols = new TIntObjectHashMap<>();
          {
              linkedProtocols.put( ProtocolConstants.MINECRAFT_1_8, Arrays.asList(
@@ -179,7 +179,7 @@ index c08398b1..e28788e5 100644
                      ProtocolConstants.MINECRAFT_1_9,
                      ProtocolConstants.MINECRAFT_1_12,
                      ProtocolConstants.MINECRAFT_1_13
-@@ -450,7 +452,11 @@ public enum Protocol
+@@ -431,7 +433,11 @@ public enum Protocol
              }
              if ( !hasPacket(id, supportsForge) )
              {
@@ -574,7 +574,7 @@ index 00000000..2aa68858
 +    }
 +}
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
-index 9c367d3a..292fece6 100644
+index c23b1947..b461e94e 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
 @@ -6,6 +6,8 @@ import java.util.List;
@@ -586,15 +586,15 @@ index 9c367d3a..292fece6 100644
      public static final int MINECRAFT_1_8 = 47;
      public static final int MINECRAFT_1_9 = 107;
      public static final int MINECRAFT_1_9_1 = 108;
-@@ -20,6 +22,7 @@ public class ProtocolConstants
-     public static final int MINECRAFT_1_13 = 389;
-     public static final int MINECRAFT_1_13_R = 393;
+@@ -19,6 +21,7 @@ public class ProtocolConstants
+     public static final int MINECRAFT_1_12_2 = 340;
+     public static final int MINECRAFT_1_13 = 393;
      public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
 +            "1.7.x",
              "1.8.x",
              "1.9.x",
              "1.10.x",
-@@ -28,6 +31,8 @@ public class ProtocolConstants
+@@ -27,6 +30,8 @@ public class ProtocolConstants
              "1.13.x"
      );
      public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList(
@@ -1808,7 +1808,7 @@ index 719ad409..a5c798f4 100644
              con.getServer().disconnect( "Quitting" );
          }
 diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
-index 66a9d336..f5c9e2f1 100644
+index bad9773b..45716724 100644
 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
 +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
 @@ -29,6 +29,10 @@ public abstract class EntityMap