Merge upstream

Resolves #192

BungeeCord

@@ -1 +1 @@
-Subproject commit 4c84f37fd23dfd67e4fee5dfd7cb62d67791129f
+Subproject commit eb288a80c37c4239ffb0ebd6fde3bb02e7fd99a0

BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch

@@ -1,4 +1,4 @@
-From 49dbe167d0972e44cf1011adb32539b51326886d Mon Sep 17 00:00:00 2001
+From 1829e8a96a90d7600af62285564eba17604afcb4 Mon Sep 17 00:00:00 2001
 From: Daniel Naylor <git@drnaylor.co.uk>
 Date: Tue, 25 Oct 2016 12:23:07 -0400
 Subject: [PATCH] Add support for FML with IP Forwarding enabled
@@ -67,10 +67,10 @@ index 4a96a601..61c53b30 100644
          }
  
 diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-index 93df9747..74c5a089 100644
+index 4c828815..37479be3 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -178,8 +178,12 @@ public final class UserConnection implements ProxiedPlayer
+@@ -164,8 +164,12 @@ public final class UserConnection implements ProxiedPlayer
  
          forgeClientHandler = new ForgeClientHandler( this );
  
@@ -100,5 +100,5 @@ index 6dca2048..f5253b89 100644
       * The FML 1.8 handshake token.
       */
 -- 
-2.14.1
+2.14.3
 

BungeeCord-Patches/0016-Micro-optimizations.patch

@@ -1,4 +1,4 @@
-From 199c5347f3d8ee7a56f86e0cdbb76d845bede1a6 Mon Sep 17 00:00:00 2001
+From 83a86a46fbdd858c96d2ffd434d415cae2f04621 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 18:05:33 -0600
 Subject: [PATCH] Micro-optimizations
@@ -46,10 +46,10 @@ index 82c3ec14..6b40faaa 100644
          {
          }
 diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-index 74c5a089..28e79933 100644
+index 37479be3..d1ec66c1 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -546,7 +546,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -532,7 +532,7 @@ public final class UserConnection implements ProxiedPlayer
      @Override
      public Locale getLocale()
      {
@@ -59,7 +59,7 @@ index 74c5a089..28e79933 100644
  
      @Override
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index a92b806c..19fd3b3b 100644
+index 95b547b3..5829dda9 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 @@ -222,7 +222,6 @@ public class DownstreamBridge extends PacketHandler
@@ -67,7 +67,7 @@ index a92b806c..19fd3b3b 100644
      public void handle(PluginMessage pluginMessage) throws Exception
      {
 -        DataInput in = pluginMessage.getStream();
-         PluginMessageEvent event = new PluginMessageEvent( con.getServer(), con, pluginMessage.getTag(), pluginMessage.getData().clone() );
+         PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
  
          if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
 @@ -249,6 +248,7 @@ public class DownstreamBridge extends PacketHandler

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

@@ -1,4 +1,4 @@
-From c5e2f8f7f2c9ef65783ce344888d309f70a9d528 Mon Sep 17 00:00:00 2001
+From 8adb1e83be972c4c99dd476f8b5ffc5c8911ab11 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
@@ -49,10 +49,10 @@ index 16cfff8b..98754bdf 100644
       * Gets the server this player is connected to.
       *
 diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-index ccb6b6ca..055a886d 100644
+index 158dfb18..e9da4202 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -246,6 +246,12 @@ public final class UserConnection implements ProxiedPlayer
+@@ -232,6 +232,12 @@ public final class UserConnection implements ProxiedPlayer
  
      public void connect(ServerInfo info, final Callback<Boolean> callback, final boolean retry)
      {
@@ -65,7 +65,7 @@ index ccb6b6ca..055a886d 100644
          Preconditions.checkNotNull( info, "info" );
  
          ServerConnectEvent event = new ServerConnectEvent( this, info );
-@@ -319,7 +325,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -305,7 +311,7 @@ public final class UserConnection implements ProxiedPlayer
                      if ( retry && def != null && ( getServer() == null || def != getServer().getInfo() ) )
                      {
                          sendMessage( bungee.getTranslation( "fallback_lobby" ) );
@@ -74,7 +74,7 @@ index ccb6b6ca..055a886d 100644
                      } else if ( dimensionChange )
                      {
                          disconnect( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) );
-@@ -334,7 +340,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -320,7 +326,7 @@ public final class UserConnection implements ProxiedPlayer
                  .channel( PipelineUtils.getChannel() )
                  .group( ch.getHandle().eventLoop() )
                  .handler( initializer )
@@ -84,5 +84,5 @@ index ccb6b6ca..055a886d 100644
          // Windows is bugged, multi homed users will just have to live with random connecting IPs
          if ( getPendingConnection().getListener().isSetLocalAddress() && !PlatformDependent.isWindows() )
 -- 
-2.14.1
+2.14.3