diff --git a/BungeeCord b/BungeeCord
index b728aea..6104354 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit b728aea382c8d54691cce53749c6f15c4ed89dd5
+Subproject commit 6104354fa1a87a8a09d852ef8ec388611a9b51f1
diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch
index 1582ae3..9729429 100644
--- a/BungeeCord-Patches/0001-POM-Changes.patch
+++ b/BungeeCord-Patches/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From ba49e7fc3950ef11d37c43ccfe77bf8286d7f942 Mon Sep 17 00:00:00 2001
+From b23fa70f4ee594b297212cc6c674756724f06d29 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 10:33:31 -0700
 Subject: [PATCH] POM Changes
@@ -724,7 +724,7 @@ index 63d0498..3421be0 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 703fbda..1220a41 100644
+index 2bb124e..99d4628 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -4,18 +4,18 @@
@@ -751,7 +751,7 @@ index 703fbda..1220a41 100644
      <description>Proxy component of the Elastic Portal Suite</description>
  
      <dependencies>
-@@ -39,32 +39,32 @@
+@@ -45,32 +45,32 @@
              <scope>compile</scope>
          </dependency>
          <dependency>
@@ -836,5 +836,5 @@ index fbadb18..349d5cc 100644
              <scope>compile</scope>
          </dependency>
 -- 
-2.10.0
+2.7.4
 
diff --git a/BungeeCord-Patches/0018-Allow-invalid-packet-ids-for-forge-servers.patch b/BungeeCord-Patches/0018-Allow-invalid-packet-ids-for-forge-servers.patch
index b9ab0e9..24b2311 100644
--- a/BungeeCord-Patches/0018-Allow-invalid-packet-ids-for-forge-servers.patch
+++ b/BungeeCord-Patches/0018-Allow-invalid-packet-ids-for-forge-servers.patch
@@ -1,4 +1,4 @@
-From ed69b7e08433166181a6c167d14d932c775ea472 Mon Sep 17 00:00:00 2001
+From d8d51afa5bfb57f5f353137c850baf7977907613 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 19 May 2016 17:09:22 -0600
 Subject: [PATCH] Allow invalid packet ids for forge servers
@@ -101,10 +101,10 @@ index a439f79..f278a48 100644
      @Getter
      @NonNull
 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 a8728bb..13d794e 100644
+index e103cc0..d98a805 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
-@@ -108,6 +108,12 @@ public abstract class EntityMap
+@@ -197,6 +197,12 @@ public abstract class EntityMap
          int packetId = DefinedPacket.readVarInt( packet );
          int packetIdLength = packet.readerIndex() - readerIndex;
  
diff --git a/BungeeCord-Patches/0040-Use-async-Netty-DNS-resolver.patch b/BungeeCord-Patches/0040-Use-async-Netty-DNS-resolver.patch
index 5a771b1..f098a90 100644
--- a/BungeeCord-Patches/0040-Use-async-Netty-DNS-resolver.patch
+++ b/BungeeCord-Patches/0040-Use-async-Netty-DNS-resolver.patch
@@ -1,4 +1,4 @@
-From bf31dfa1560b2be03d92ec8ecda481ce108d49d1 Mon Sep 17 00:00:00 2001
+From 2a1f5297000df92b5acda072422f68137ae1d2a1 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Wed, 21 Dec 2016 03:13:03 -0500
 Subject: [PATCH] Use async Netty DNS resolver
@@ -6,10 +6,10 @@ Subject: [PATCH] Use async Netty DNS resolver
 We no longer need to cache the address for the session server now.
 
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 1220a41..5d105b0 100644
+index 99d4628..180b78d 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
-@@ -25,6 +25,14 @@
+@@ -31,6 +31,14 @@
              <version>${netty.version}</version>
              <scope>compile</scope>
          </dependency>