Merge upstream

BungeeCord

@@ -1 +1 @@
-Subproject commit 5cdb181cc51587386c13d2bfb5a034f72ccae126
+Subproject commit 0a95af5dc1a0c6106edea718b87ddadca05201a3

BungeeCord-Patches/0028-Add-dynamic-server-addition-removal-api.patch

@@ -1,4 +1,4 @@
-From e6bf822451bdae03f2b34af75ab45150d8a8af0f Mon Sep 17 00:00:00 2001
+From c77fc4bf6ab9075ea81a378ee0bbb1d8ab2eeef6 Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Wed, 29 Jun 2016 04:29:25 +0200
 Subject: [PATCH] Add dynamic server addition/removal api.

BungeeCord-Patches/0028-Better-debug-checks.patch

@@ -1,22 +0,0 @@
-From 4f9ac24b7795f778c4f0d6c2a975e46d07b52a35 Mon Sep 17 00:00:00 2001
-From: Techcable <Techcable@techcable.net>
-Date: Wed, 6 Apr 2016 23:46:00 -0700
-Subject: [PATCH] Better debug checks
-
-
-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 96d3c99e..da53ff0f 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
-@@ -470,7 +470,7 @@ public enum Protocol
-             {
-                 throw new BadPacketException( "Unsupported protocol version" );
-             }
--            Preconditions.checkArgument( protocolData.packetMap.containsKey( packet ), "Cannot get ID for packet " + packet );
-+            Preconditions.checkArgument( protocolData.packetMap.containsKey( packet ), "Cannot get ID for packet %s in state %s", packet, protocolPhase);
- 
-             return protocolData.packetMap.get( packet );
-         }
--- 
-2.18.0
-

BungeeCord-Patches/0029-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch

@@ -1,4 +1,4 @@
-From 6e96191ab29d996b10aa4eb56b583a69d42a7a2c Mon Sep 17 00:00:00 2001
+From 5b753c311625da73afc78534c0c3da77dc489fe4 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Mon, 6 Jun 2016 13:36:10 -0600
 Subject: [PATCH] Don't send KICK packets while in HANDSHAKE state

BungeeCord-Patches/0030-Improve-ServerKickEvent.patch

@@ -1,4 +1,4 @@
-From ccb2418a2b6dd46f3bf16f021994295621108c05 Mon Sep 17 00:00:00 2001
+From acbdc846752ec4eaee62fac5636b5f0789e4261d Mon Sep 17 00:00:00 2001
 From: Nathan Poirier <nathan@poirier.io>
 Date: Tue, 28 Jun 2016 23:00:49 -0500
 Subject: [PATCH] Improve ServerKickEvent

BungeeCord-Patches/0031-Configurable-server-version-in-ping-response.patch

@@ -1,4 +1,4 @@
-From e4f6e5fd5748412ad7d6d4a592fcdcbf2befb466 Mon Sep 17 00:00:00 2001
+From 59052ad260158fbdccb46608001c9222759fdd31 Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Wed, 29 Jun 2016 13:56:57 -0500
 Subject: [PATCH] Configurable server version in ping response

BungeeCord-Patches/0032-Add-timeout-variant-to-connect-methods.patch

@@ -1,4 +1,4 @@
-From df274598aa8366c53dc3c58321a5f498f0369c4a Mon Sep 17 00:00:00 2001
+From 830983d461fddced10587104347dba06924068f3 Mon Sep 17 00:00:00 2001
 From: Ichbinjoe <joe@ibj.io>
 Date: Sat, 16 Jul 2016 20:44:01 -0400
 Subject: [PATCH] Add timeout variant to connect methods

BungeeCord-Patches/0033-Proxy-query-event.patch

@@ -1,4 +1,4 @@
-From 97d915652032cf21da338136fd8d5ac91752186c Mon Sep 17 00:00:00 2001
+From 885489eeb7891db0a9c086c36f5e6802a75947f9 Mon Sep 17 00:00:00 2001
 From: minecrafter <unknown@unknown>
 Date: Sun, 3 Jul 2016 04:03:21 -0400
 Subject: [PATCH] Proxy query event

BungeeCord-Patches/0034-Dump-the-raw-hex-of-a-packet-on-a-decoding-error.patch

@@ -1,4 +1,4 @@
-From cf8c0cda05305f7bd23dcd2ed2464a0f4c0f7cb3 Mon Sep 17 00:00:00 2001
+From 6cd0ed18bbe56ce567fdef62381e01486c4feb9d Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 4 Aug 2016 19:30:49 -0700
 Subject: [PATCH] Dump the raw hex of a packet on a decoding error

BungeeCord-Patches/0035-Fix-potion-race-condition-on-Forge-1.8.9.patch

@@ -1,4 +1,4 @@
-From 59c2ac94212b06ce965ebe967ed6c389fa1895f4 Mon Sep 17 00:00:00 2001
+From bcb50a65f02e87abccf39b2cdb1c4ae072307838 Mon Sep 17 00:00:00 2001
 From: Aaron Hill <aa1ronham@gmail.com>
 Date: Thu, 15 Sep 2016 22:38:37 +0200
 Subject: [PATCH] Fix potion race condition on Forge 1.8.9
@@ -32,7 +32,7 @@ index 93f324e2..0e81b43c 100644
 +    // Waterfall end
  }
 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 da53ff0f..82e9a1d6 100644
+index 18081eab..a8ac332a 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
 @@ -16,6 +16,8 @@ import net.md_5.bungee.protocol.packet.Chat;

BungeeCord-Patches/0036-Optionally-use-async-Netty-DNS-resolver.patch

@@ -1,4 +1,4 @@
-From 58bac7c43dc53cb8ebd8c2b9f2b7e3020806abe4 Mon Sep 17 00:00:00 2001
+From b1095694b758fd1453d0e1ca679f219a25544987 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Wed, 21 Dec 2016 03:13:03 -0500
 Subject: [PATCH] Optionally use async Netty DNS resolver

BungeeCord-Patches/0037-Security-enhancements-for-EncryptionUtil.patch

@@ -1,4 +1,4 @@
-From 2d24076492612c9a919fcd4cb7d66ac647597528 Mon Sep 17 00:00:00 2001
+From 4c43c251127a974d64a86192d81c32c30f63f01c Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Wed, 21 Dec 2016 04:07:26 -0500
 Subject: [PATCH] Security enhancements for EncryptionUtil

BungeeCord-Patches/0038-Improve-outdated-build-message.patch

@@ -1,4 +1,4 @@
-From f1874ae942e3360895f48572822e1ff19dbec56f Mon Sep 17 00:00:00 2001
+From 6939e7804f00071bd96bb546975ae6e56b63a0e9 Mon Sep 17 00:00:00 2001
 From: Jamie Mansfield <dev@jamierocks.uk>
 Date: Sat, 10 Jun 2017 20:56:02 +0100
 Subject: [PATCH] Improve outdated build message

BungeeCord-Patches/0039-Fix-some-forge-plugin-message-packets-not-being-forw.patch

@@ -1,4 +1,4 @@
-From 77091f7a98ce5132ef679faac995fb70b69cbdc0 Mon Sep 17 00:00:00 2001
+From 34a11c848c6c9f8007b6fb0bb022a2615e6797ff Mon Sep 17 00:00:00 2001
 From: Daniel Naylor <git@drnaylor.co.uk>
 Date: Mon, 17 Jul 2017 20:24:17 +0100
 Subject: [PATCH] Fix some forge plugin message packets not being forwarded

BungeeCord-Patches/0040-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch

@@ -1,4 +1,4 @@
-From 2b47e488f5f1c562a71a7eb8b8d9c02f0c943ea7 Mon Sep 17 00:00:00 2001
+From 8608d4bdfea1916353238c7ae20a4ec218e31321 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 12:46:47 +0200
 Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for

BungeeCord-Patches/0041-Handle-plugin-prefixes-using-Log4J.patch

@@ -1,4 +1,4 @@
-From f0803d62012e3b0f6260bba862bae16c4551b9b2 Mon Sep 17 00:00:00 2001
+From 1bcb0f08d55c92290e2443b4e88d7d7b19ac6f6d Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 13:07:31 +0200
 Subject: [PATCH] Handle plugin prefixes using Log4J

BungeeCord-Patches/0042-Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -1,4 +1,4 @@
-From 43169af28b3e8622ac7e80c22b33f1bf66eeb778 Mon Sep 17 00:00:00 2001
+From 34006bf32ef70c80581b239aa6853d1da9cc2fbd Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 13:15:09 +0200
 Subject: [PATCH] Allow plugins to use SLF4J for logging

BungeeCord-Patches/0043-Add-Log4j-configuration-that-replicates-the-old-Bung.patch

@@ -1,4 +1,4 @@
-From 3cb9f95261cc5461546b0b98718717d4905a30c6 Mon Sep 17 00:00:00 2001
+From 06b01e2a187dff5b9241cc7a411c9d7f9cf2d3cd Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Sun, 24 Sep 2017 12:06:49 +0200
 Subject: [PATCH] Add Log4j configuration that replicates the old BungeeCord

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

@@ -1,4 +1,4 @@
-From cda9fb2d03812217e931ffd63e516395e3a65799 Mon Sep 17 00:00:00 2001
+From 3430d27d1d5f87cb7696819dbf267df76d1698a5 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

BungeeCord-Patches/0045-Providing-access-to-the-player-s-LoginResult-on-Logi.patch

@@ -1,4 +1,4 @@
-From 4fe832da4634274b6a5fa7d8591612ec37a6355f Mon Sep 17 00:00:00 2001
+From d6788eb339161825d9cc132a551b17f68290f924 Mon Sep 17 00:00:00 2001
 From: phenomax <phenomax@revayd.net>
 Date: Thu, 10 Aug 2017 18:41:17 +0200
 Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent

BungeeCord-Patches/0046-Optionally-log-InitialHandler-connections.patch

@@ -1,4 +1,4 @@
-From 353f994a51cd870b1344e302910f7d22c04a75e1 Mon Sep 17 00:00:00 2001
+From 2cfa87ce594755647688295f317aa7c622ccd376 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Thu, 8 Feb 2018 19:10:52 +0100
 Subject: [PATCH] Optionally log InitialHandler connections

BungeeCord-Patches/0047-Forge-is-a-first-class-citizen.patch

@@ -1,4 +1,4 @@
-From 55a04e84b0162e8acbfeaa51334103892eae281d Mon Sep 17 00:00:00 2001
+From 4de31ce7ef10e050ab3b1ed0e18b4cd4730ff21a Mon Sep 17 00:00:00 2001
 From: Jamie Mansfield <dev@jamierocks.uk>
 Date: Mon, 28 May 2018 21:43:55 +0100
 Subject: [PATCH] Forge is a first class citizen