Merge upstream

BungeeCord

@@ -1 +1 @@
-Subproject commit 1c5bff7ed7c0abfd5a3ffcb193e002b6695d82bd
+Subproject commit cb4108c1b4638e83cb891e9d3acfc68cf1e1052c

BungeeCord-Patches/0017-Micro-optimizations.patch

@@ -1,4 +1,4 @@
-From c5f4b70c8a48babd30dd0ccefe0e2277fe327fb4 Mon Sep 17 00:00:00 2001
+From 7efdaf9473c1dc4618d0dc8ac5c18ae196ac2a06 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Tue, 19 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Micro-optimizations
@@ -7,27 +7,6 @@ Subject: [PATCH] Micro-optimizations
 - Don't attempt to format arguments when there are none provided
 - Don't create a data input stream for every plugin message we get from servers
 
-diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
-index 096538a7..54a65155 100644
---- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
-+++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
-@@ -42,7 +42,6 @@ import org.yaml.snakeyaml.introspector.PropertyUtils;
- public class PluginManager
- {
- 
--    private static final Pattern argsSplit = Pattern.compile( " " );
-     /*========================================================================*/
-     private final ProxyServer proxy;
-     /*========================================================================*/
-@@ -126,7 +125,7 @@ public class PluginManager
-      */
-     public boolean dispatchCommand(CommandSender sender, String commandLine, List<String> tabResults)
-     {
--        String[] split = argsSplit.split( commandLine, -1 );
-+        String[] split = commandLine.split(" ", -1);
-         // Check for chat that only contains " "
-         if ( split.length == 0 )
-         {
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 index 4a13910e..4fbc307c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java

BungeeCord-Patches/0042-Add-console-command-completion.patch

@@ -1,4 +1,4 @@
-From 723106d47973b5eaec21f6499c7ba75e61cd484b Mon Sep 17 00:00:00 2001
+From 6416fac20ab6c775f7215b522ba3ca4694fddb48 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 26 Sep 2017 18:59:37 +0200
 Subject: [PATCH] Add console command completion
@@ -7,10 +7,10 @@ Register command completer for JLine to complete command names and
 command arguments (if supported).
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
-index 54a65155..3e96b126 100644
+index 05dbe499..f882a678 100644
 --- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
 +++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
-@@ -181,6 +181,41 @@ public class PluginManager
+@@ -180,6 +180,41 @@ public class PluginManager
          return true;
      }