Merge upstream

Fixes #101
PaperMC · Nov 25, 2016 · dd44f67 · dd44f67
1 parent b751896
commit dd44f67
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/BungeeCord b/BungeeCord
diff --git a/BungeeCord-Patches/0017-Micro-optimizations.patch b/BungeeCord-Patches/0017-Micro-optimizations.patch
@@ -1,4 +1,4 @@
-From 34ee7df4a7d9f451768b737f00747c635e4e3d7b Mon Sep 17 00:00:00 2001
+From 81c109310e7da6e5ab30701bed7a68ec409cc504 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
@@ -28,10 +28,10 @@ index 71a5a15..520ee31 100644
          if ( split.length == 0 )
          {
 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 780ad9f..042dab3 100644
+index e10ea44..5b02c5f 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -551,7 +551,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -556,7 +556,7 @@ public final class UserConnection implements ProxiedPlayer
      @Override
      public Locale getLocale()
      {
@@ -41,5 +41,5 @@ index 780ad9f..042dab3 100644
 
      @Override
 -- 
-2.7.4 (Apple Git-66)
+2.10.2
 
diff --git a/BungeeCord-Patches/0035-Add-timeout-variant-to-connect-methods.patch b/BungeeCord-Patches/0035-Add-timeout-variant-to-connect-methods.patch
@@ -1,4 +1,4 @@
-From 4f55bde65e4220f8e1d5456b4bb4ea2c74d24e05 Mon Sep 17 00:00:00 2001
+From 8db3af1afef62b24256ad9d49dce060333b67a9d 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,7 +49,7 @@ index 375815c..c49e900 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 6d197ef..7e934ef 100644
+index 81c2376..424830e 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 @@ -248,6 +248,12 @@ public final class UserConnection implements ProxiedPlayer
@@ -65,7 +65,7 @@ index 6d197ef..7e934ef 100644
          Preconditions.checkNotNull( info, "info" );
 
          ServerConnectEvent event = new ServerConnectEvent( this, info );
-@@ -316,7 +322,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -321,7 +327,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 6d197ef..7e934ef 100644
                      } else if ( dimensionChange )
                      {
                          disconnect( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) );
-@@ -331,7 +337,7 @@ public final class UserConnection implements ProxiedPlayer
+@@ -336,7 +342,7 @@ public final class UserConnection implements ProxiedPlayer
                  .channel( PipelineUtils.getChannel() )
                  .group( ch.getHandle().eventLoop() )
                  .handler( initializer )
@@ -84,5 +84,5 @@ index 6d197ef..7e934ef 100644
          // Windows is bugged, multi homed users will just have to live with random connecting IPs
          if ( getPendingConnection().getListener().isSetLocalAddress() && !PlatformDependent.isWindows() )
 -- 
-2.10.0
+2.10.2