Merge upstream

2024-11-24 19:25:16 +01:00 · 2017-08-04 14:57:11 +01:00 · 2017-08-04 14:57:11 +01:00 · 2b302da76c
commit 2b302da76c
parent a90dae10c9
8 changed files with 46 additions and 46 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 017f3a2424e0a210d5bdfbf45720aa1ef073a223
+Subproject commit 2ae8ba0afc68215d4c702067d13abdd62a774539
--- a/BungeeCord-Patches/0008-Don-t-access-a-ByteBuf-s-underlying-array.patch
+++ b/BungeeCord-Patches/0008-Don-t-access-a-ByteBuf-s-underlying-array.patch
@ -1,4 +1,4 @@
-From 8c4ac3ae1dcfd693fd27f148c01ca7efbba9876a Mon Sep 17 00:00:00 2001
+From ee9913c20e8a472b4f38d515d2aff5278f4de225 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Tue, 3 May 2016 20:31:52 -0700
 Subject: [PATCH] Don't access a ByteBuf's underlying array
@ -6,7 +6,7 @@ Subject: [PATCH] Don't access a ByteBuf's underlying array
 It returns the underlying array storage, and does *not* return a view of the buffer as an array

 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
-index 6dcdece..e67773d 100644
+index 6dcdece5..e67773d9 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PluginMessage.java
@@ -2,6 +2,7 @@ package net.md_5.bungee.protocol.packet;
@ -43,10 +43,10 @@ index 6dcdece..e67773d 100644
      * Allow this packet to be sent as an "extended" packet.
      */
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index 2014b0c..6b77d90 100644
+index 111ee8b4..fcb3dc0d 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -197,7 +197,7 @@ public class ServerConnector extends PacketHandler
+@@ -199,7 +199,7 @@ public class ServerConnector extends PacketHandler
 
             ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
             DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
@ -56,10 +56,10 @@ index 2014b0c..6b77d90 100644
 
             user.setDimension( login.getDimension() );
 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 c2dd942..c0a5061 100644
+index 57fe06e5..4299bc7a 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
-@@ -240,7 +240,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -241,7 +241,7 @@ public class DownstreamBridge extends PacketHandler
 
             brand = ByteBufAllocator.DEFAULT.heapBuffer();
             DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
@ -69,7 +69,7 @@ index c2dd942..c0a5061 100644
             // changes in the packet are ignored so we need to send it manually
             con.unsafe().sendPacket( pluginMessage );
 diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-index f239c7d..384d958 100644
+index f239c7d8..384d9588 100644
 --- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
 +++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -41,9 +41,9 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;
@ -86,5 +86,5 @@ index f239c7d..384d958 100644
     {
         @Override
 -- 
-2.7.4 (Apple Git-66)
+2.13.4

--- a/BungeeCord-Patches/0012-Add-support-for-FML-with-IP-Forwarding-enabled.patch
+++ b/BungeeCord-Patches/0012-Add-support-for-FML-with-IP-Forwarding-enabled.patch
@ -1,4 +1,4 @@
-From 575a466a3a0c906bfe52be10890e6fbcbcf2aa7c Mon Sep 17 00:00:00 2001
+From c7982cae7484dd1fd4288ad0076c3ca9c6be5c79 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
@ -12,7 +12,7 @@ However, there is now at least one Forge coremod that intends to support IP forw
 No breaking changes occur due to this patch.

 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index 6b77d90..f25b26d 100644
+index fcb3dc0d..e0235212 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -3,6 +3,7 @@ package net.md_5.bungee;
@ -23,7 +23,7 @@ index 6b77d90..f25b26d 100644
 import java.util.Queue;
 import java.util.Set;
 import java.util.UUID;
-@@ -90,15 +91,39 @@ public class ServerConnector extends PacketHandler
+@@ -92,15 +93,39 @@ public class ServerConnector extends PacketHandler
             String newHost = copiedHandshake.getHost() + "\00" + user.getAddress().getHostString() + "\00" + user.getUUID();
 
             LoginResult profile = user.getPendingConnection().getLoginProfile();
@ -67,7 +67,7 @@ index 6b77d90..f25b26d 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 d620fbf..780ad9f 100644
+index c45f8412..f28e7182 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -180,8 +180,12 @@ public final class UserConnection implements ProxiedPlayer
@ -85,7 +85,7 @@ index d620fbf..780ad9f 100644
 
     public void sendPacket(PacketWrapper packet)
 diff --git a/proxy/src/main/java/net/md_5/bungee/forge/ForgeConstants.java b/proxy/src/main/java/net/md_5/bungee/forge/ForgeConstants.java
-index 6dca204..f5253b8 100644
+index 6dca2048..f5253b89 100644
 --- a/proxy/src/main/java/net/md_5/bungee/forge/ForgeConstants.java
 +++ b/proxy/src/main/java/net/md_5/bungee/forge/ForgeConstants.java
@@ -14,6 +14,10 @@ public class ForgeConstants
@ -100,5 +100,5 @@ index 6dca204..f5253b8 100644
      * The FML 1.8 handshake token.
      */
 -- 
-2.7.4 (Apple Git-66)
+2.13.4

--- a/BungeeCord-Patches/0017-Micro-optimizations.patch
+++ b/BungeeCord-Patches/0017-Micro-optimizations.patch
@ -1,4 +1,4 @@
-From 24ac547d72897b6331246870ae473629fd2ed25c Mon Sep 17 00:00:00 2001
+From fe6f72f9e06cf8662a4b27fc9ffa6369c1aa7ad5 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
@ -10,7 +10,7 @@ Subject: [PATCH] Micro-optimizations
 - Optimise replacing dashes in UUID's

 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 71a5a15..520ee31 100644
+index 71a5a158..520ee315 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;
@ -31,7 +31,7 @@ index 71a5a15..520ee31 100644
         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 34e3c3e..93dd74e 100644
+index 34e3c3e3..93dd74ee 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -493,7 +493,9 @@ public class BungeeCord extends ProxyServer
@ -46,7 +46,7 @@ index 34e3c3e..93dd74e 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 f28e718..a70ac2c 100644
+index f28e7182..a70ac2c9 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -548,7 +548,7 @@ public final class UserConnection implements ProxiedPlayer
@ -59,10 +59,10 @@ index f28e718..a70ac2c 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 c0a5061..ce32f6b 100644
+index 4299bc7a..dc780634 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
+@@ -223,7 +223,6 @@ public class DownstreamBridge extends PacketHandler
     @Override
     public void handle(PluginMessage pluginMessage) throws Exception
     {
@ -70,7 +70,7 @@ index c0a5061..ce32f6b 100644
         PluginMessageEvent event = new PluginMessageEvent( con.getServer(), con, pluginMessage.getTag(), pluginMessage.getData().clone() );
 
         if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
-@@ -249,6 +248,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -250,6 +249,7 @@ public class DownstreamBridge extends PacketHandler
 
         if ( pluginMessage.getTag().equals( "BungeeCord" ) )
         {
@ -79,5 +79,5 @@ index c0a5061..ce32f6b 100644
             String subChannel = in.readUTF();
 
 -- 
-2.7.4 (Apple Git-66)
+2.13.4

--- a/BungeeCord-Patches/0018-Allow-invalid-packet-ids-for-forge-servers.patch
+++ b/BungeeCord-Patches/0018-Allow-invalid-packet-ids-for-forge-servers.patch
@ -1,4 +1,4 @@
-From 07c2f62e5c41051c6b3a7567e8b199ca6dcb614a Mon Sep 17 00:00:00 2001
+From 29f41582be2e1900b28375aee2f3c5ca5117fc9f Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 19 May 2016 17:09:22 -0600
 Subject: [PATCH] Allow invalid packet ids for forge servers
@ -66,10 +66,10 @@ index 61e2b42d..c92a922a 100644
                 throw new BadPacketException( "Packet with id " + id + " outside of range " );
             }
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index f25b26d6..ed057b8a 100644
+index e0235212..dc5b82e2 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -28,7 +28,9 @@ import net.md_5.bungee.forge.ForgeUtils;
+@@ -29,7 +29,9 @@ import net.md_5.bungee.forge.ForgeUtils;
 import net.md_5.bungee.netty.ChannelWrapper;
 import net.md_5.bungee.netty.HandlerBoss;
 import net.md_5.bungee.netty.PacketHandler;
@ -79,7 +79,7 @@ index f25b26d6..ed057b8a 100644
 import net.md_5.bungee.protocol.Protocol;
 import net.md_5.bungee.protocol.packet.EncryptionRequest;
 import net.md_5.bungee.protocol.packet.Handshake;
-@@ -181,6 +183,12 @@ public class ServerConnector extends PacketHandler
+@@ -183,6 +185,12 @@ public class ServerConnector extends PacketHandler
 
         ServerConnection server = new ServerConnection( ch, target );
         ServerConnectedEvent event = new ServerConnectedEvent( user, server );
@ -122,5 +122,5 @@ index 3e0ec0d5..a6d9310f 100644
         {
             rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.13.0
+2.13.4

--- a/BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch
+++ b/BungeeCord-Patches/0022-Optional-server-list-ping-logging.patch
@ -1,4 +1,4 @@
-From 94262394783a847ac69092a99336359f25a073cb Mon Sep 17 00:00:00 2001
+From c41a2ef38bd0f0d82d9d6ca78e721cd0cd28ea67 Mon Sep 17 00:00:00 2001
 From: Janmm14 <computerjanimaus@yahoo.de>
 Date: Sat, 12 Dec 2015 23:43:30 +0100
 Subject: [PATCH] Optional server list ping logging.
@ -61,10 +61,10 @@ index e56d3591..68f25460 100644
 +    }
 }
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index ed057b8a..a37f3ea3 100644
+index dc5b82e2..f8532dc2 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -382,6 +382,6 @@ public class ServerConnector extends PacketHandler
+@@ -388,6 +388,6 @@ public class ServerConnector extends PacketHandler
     @Override
     public String toString()
     {
@ -73,10 +73,10 @@ index ed057b8a..a37f3ea3 100644
     }
 }
 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 ce32f6b1..470f0bef 100644
+index dc780634..e48ebc0f 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
-@@ -510,6 +510,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -511,6 +511,6 @@ public class DownstreamBridge extends PacketHandler
     @Override
     public String toString()
     {
@ -85,7 +85,7 @@ index ce32f6b1..470f0bef 100644
     }
 }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 616e9ee8..497384c4 100644
+index 289fdf67..ded09742 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -282,19 +282,22 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@ -134,5 +134,5 @@ index 654be214..618e76e3 100644
     }
 }
 -- 
-2.12.0
+2.13.4

--- a/BungeeCord-Patches/0034-Improve-ServerKickEvent.patch
+++ b/BungeeCord-Patches/0034-Improve-ServerKickEvent.patch
@ -1,4 +1,4 @@
-From e072edbf35417eacae29526145e965f92db35ff6 Mon Sep 17 00:00:00 2001
+From 623bf49248ff747e68d338d7a45c5b0fff5a1a5f 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
@ -6,7 +6,7 @@ Subject: [PATCH] Improve ServerKickEvent
 ServerKickEvent traditionally will only fire if the server sends a kick packet. During a server shutdown, or server crash this event would not fire for most players. While ServerDisconnectEvent is fired it does not tell us if it was a kick/shutdown/server crash.  This improvement fires the ServerKickEvent for server caused disconnections, and adds a Cause to the kick event.

 diff --git a/api/src/main/java/net/md_5/bungee/api/event/ServerKickEvent.java b/api/src/main/java/net/md_5/bungee/api/event/ServerKickEvent.java
-index 0e1ef5c..ee63732 100644
+index 0e1ef5c4..ee63732d 100644
 --- a/api/src/main/java/net/md_5/bungee/api/event/ServerKickEvent.java
 +++ b/api/src/main/java/net/md_5/bungee/api/event/ServerKickEvent.java
@@ -44,6 +44,12 @@ public class ServerKickEvent extends Event implements Cancellable
@ -62,10 +62,10 @@ index 0e1ef5c..ee63732 100644
     @Deprecated
     public String getKickReason()
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index a37f3ea..5d72a56 100644
+index f8532dc2..c447524e 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -307,7 +307,7 @@ public class ServerConnector extends PacketHandler
+@@ -313,7 +313,7 @@ public class ServerConnector extends PacketHandler
     public void handle(Kick kick) throws Exception
     {
         ServerInfo def = user.updateAndGetNextServer( target );
@ -75,7 +75,7 @@ index a37f3ea..5d72a56 100644
         {
             // Pre cancel the event if we are going to try another server
 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 4768cb4..356cf4f 100644
+index e48ebc0f..1339373d 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
@@ -60,16 +60,19 @@ public class DownstreamBridge extends PacketHandler
@ -124,7 +124,7 @@ index 4768cb4..356cf4f 100644
         }
 
         ServerDisconnectEvent serverDisconnectEvent = new ServerDisconnectEvent( con, server.getInfo() );
-@@ -454,7 +469,11 @@ public class DownstreamBridge extends PacketHandler
+@@ -455,7 +470,11 @@ public class DownstreamBridge extends PacketHandler
     public void handle(Kick kick) throws Exception
     {
         ServerInfo def = con.updateAndGetNextServer( server.getInfo() );
@ -138,5 +138,5 @@ index 4768cb4..356cf4f 100644
         {
             con.connectNow( event.getCancelServer() );
 -- 
-2.10.0
+2.13.4

--- a/BungeeCord-Patches/0039-Fix-potion-race-condition-on-Forge-1.8.9.patch
+++ b/BungeeCord-Patches/0039-Fix-potion-race-condition-on-Forge-1.8.9.patch
@ -1,4 +1,4 @@
-From 116b5b27ce7b9f44acde7bbc4291b52c22aae800 Mon Sep 17 00:00:00 2001
+From b0a4650c261121b225ab7b4955f77848165da135 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
@ -188,7 +188,7 @@ index 8a15f59c..5831514e 100644
     @Getter
     private String displayName;
 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 1cdfb995..30ee7d16 100644
+index 1339373d..2cf4bef7 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
@@ -31,6 +31,8 @@ import net.md_5.bungee.netty.PacketHandler;
@ -200,7 +200,7 @@ index 1cdfb995..30ee7d16 100644
 import net.md_5.bungee.protocol.packet.KeepAlive;
 import net.md_5.bungee.protocol.packet.PlayerListItem;
 import net.md_5.bungee.protocol.packet.Respawn;
-@@ -520,6 +522,32 @@ public class DownstreamBridge extends PacketHandler
+@@ -521,6 +523,32 @@ public class DownstreamBridge extends PacketHandler
         }
     }
 
@ -271,5 +271,5 @@ index 673497e5..17e250d4 100644
      * Sends the server mod list to the client, or stores it for sending later.
      *
 -- 
-2.13.0
+2.13.4