diff --git a/BungeeCord b/BungeeCord
index fed646d..b34cfcd 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit fed646d18b1f40b065902833dfa4fe4ea048f122
+Subproject commit b34cfcde5a9256fd18e6979559d5c28b0d34b59d
diff --git a/BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch b/BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch
index 2ef1e14..0f32733 100644
--- a/BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch
+++ b/BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch
@@ -1,4 +1,4 @@
-From 08dbc9c2496f4c0f1d531a6a22c56e067f0f40fd Mon Sep 17 00:00:00 2001
+From a5ce9cf6ba775ef5163c65cd7f1bafd6cc4ba1d1 Mon Sep 17 00:00:00 2001
 From: Johannes Donath <johannesd@torchmind.com>
 Date: Sat, 4 Jul 2015 06:31:33 +0200
 Subject: [PATCH] Add basic support for configurable tab-complete throttling
@@ -73,10 +73,10 @@ index 741ebfde..91743f01 100644
 +    }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-index fdc29b6a..0e5d0a47 100644
+index 3c312589..d8c1c040 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-@@ -48,6 +48,8 @@ public class UpstreamBridge extends PacketHandler
+@@ -49,6 +49,8 @@ public class UpstreamBridge extends PacketHandler
      private final ProxyServer bungee;
      private final UserConnection con;
  
@@ -85,7 +85,7 @@ index fdc29b6a..0e5d0a47 100644
      public UpstreamBridge(ProxyServer bungee, UserConnection con)
      {
          this.bungee = bungee;
-@@ -221,6 +223,20 @@ public class UpstreamBridge extends PacketHandler
+@@ -223,6 +225,20 @@ public class UpstreamBridge extends PacketHandler
      @Override
      public void handle(TabCompleteRequest tabComplete) throws Exception
      {
diff --git a/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch b/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch
index ca27470..a366142 100644
--- a/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch
+++ b/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch
@@ -1,4 +1,4 @@
-From eba275ee93b6bc3a7159b427138320eeb8eaa30c Mon Sep 17 00:00:00 2001
+From 0176a0d6c9210a5799e6f745ad6c400eb814f40a Mon Sep 17 00:00:00 2001
 From: Janmm14 <computerjanimaus@yahoo.de>
 Date: Sat, 12 Dec 2015 23:43:30 +0100
 Subject: [PATCH] Improve server list ping logging
@@ -57,10 +57,10 @@ index c1e5a156..1f9a54f2 100644
  
      @Override
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-index 0e5d0a47..37178082 100644
+index d8c1c040..045e9545 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-@@ -372,6 +372,6 @@ public class UpstreamBridge extends PacketHandler
+@@ -374,6 +374,6 @@ public class UpstreamBridge extends PacketHandler
      @Override
      public String toString()
      {
diff --git a/BungeeCord-Patches/0022-Validate-that-chat-messages-are-non-blank.patch b/BungeeCord-Patches/0022-Validate-that-chat-messages-are-non-blank.patch
index 525ef64..6649953 100644
--- a/BungeeCord-Patches/0022-Validate-that-chat-messages-are-non-blank.patch
+++ b/BungeeCord-Patches/0022-Validate-that-chat-messages-are-non-blank.patch
@@ -1,14 +1,14 @@
-From edcda91b4d88b9f37535a113a73922709b86527a Mon Sep 17 00:00:00 2001
+From aa9261c4f9c7cac4124d7c144038b033952b3503 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Tue, 25 Oct 2016 12:34:41 -0400
 Subject: [PATCH] Validate that chat messages are non-blank
 
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-index 37178082..57d09507 100644
+index 045e9545..212cdbf2 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-@@ -198,6 +198,7 @@ public class UpstreamBridge extends PacketHandler
+@@ -200,6 +200,7 @@ public class UpstreamBridge extends PacketHandler
  
      private String handleChat(String message)
      {
@@ -16,7 +16,7 @@ index 37178082..57d09507 100644
          for ( int index = 0, length = message.length(); index < length; index++ )
          {
              char c = message.charAt( index );
-@@ -205,8 +206,14 @@ public class UpstreamBridge extends PacketHandler
+@@ -207,8 +208,14 @@ public class UpstreamBridge extends PacketHandler
              {
                  con.disconnect( bungee.getTranslation( "illegal_chat_characters", Util.unicode( c ) ) );
                  throw CancelSendSignal.INSTANCE;