Update upstream

2024-09-28 22:47:49 +02:00 · 2016-08-26 10:05:00 +01:00 · 2016-08-26 10:05:00 +01:00 · 1e10ca1c09
commit 1e10ca1c09
parent b3c95fca44
10 changed files with 48 additions and 46 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 98e3c70460737dcea9dc264882029729b97458e2
+Subproject commit 5c809c24990ec06ecdb0ee6550d4d10595ed9323
--- a/BungeeCord-Patches/0008-Upgrade-to-netty-4.1.patch
+++ b/BungeeCord-Patches/0008-Upgrade-to-netty-4.1.patch
@ -1,4 +1,4 @@
-From 64866791be3cf7e46d59554f38b2fdd33c73c275 Mon Sep 17 00:00:00 2001
+From f85163140995e0bdf5992b0c1993a01ce63aa571 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Tue, 3 May 2016 20:31:52 -0700
 Subject: [PATCH] Upgrade to netty 4.1
@ -37,21 +37,23 @@ index 7a74143..58e107e 100644
             <artifactId>trove4j</artifactId>
             <version>3.0.3</version>
 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 bbaef39..8e43374 100644
+index 6dcdece..e67773d 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
-@@ -1,6 +1,7 @@
- package net.md_5.bungee.protocol.packet;
+@@ -2,6 +2,7 @@ package net.md_5.bungee.protocol.packet;
 
 import com.google.common.base.Preconditions;
+ import com.google.common.base.Predicate;
 +import io.netty.buffer.ByteBufUtil;
 import net.md_5.bungee.protocol.DefinedPacket;
 import io.netty.buffer.ByteBuf;
 import java.io.ByteArrayInputStream;
-@@ -20,9 +21,22 @@ import net.md_5.bungee.protocol.ProtocolConstants;
- public class PluginMessage extends DefinedPacket
- {
- 
+@@ -29,10 +30,23 @@ public class PluginMessage extends DefinedPacket
+             return input.getTag().equals( "REGISTER" ) || input.getTag().equals( "MC|Brand" );
+         }
+     };
+-    //
+
 +    public PluginMessage(String tag, ByteBuf data, boolean allowExtendedPacket) {
 +        this(tag, ByteBufUtil.getBytes(data), allowExtendedPacket);
 +    }
@ -72,10 +74,10 @@ index bbaef39..8e43374 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 976636a..e941803 100644
+index e599e7e..ccdcf82 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -199,7 +199,7 @@ public class ServerConnector extends PacketHandler
+@@ -198,7 +198,7 @@ public class ServerConnector extends PacketHandler
 
             ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
             DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
@ -115,5 +117,5 @@ index 621a06c..0ec3f81 100644
     {
         @Override
 -- 
-2.8.2
+2.7.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 78e50168fe904dfc506b81c2c768ff8b2f8184ad Mon Sep 17 00:00:00 2001
+From 071a0ae93a30c559b6eb8fbd878b083d3b9e609a Mon Sep 17 00:00:00 2001
 From: Daniel Naylor <git@drnaylor.co.uk>
 Date: Sun, 9 Aug 2015 13:43:57 +0100
 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 e941803..58c6956 100644
+index ccdcf82..08ee400 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -4,6 +4,7 @@ import com.google.common.base.Preconditions;
@ -23,7 +23,7 @@ index e941803..58c6956 100644
 import java.util.Queue;
 import java.util.Set;
 import java.util.UUID;
-@@ -92,15 +93,39 @@ public class ServerConnector extends PacketHandler
+@@ -91,15 +92,39 @@ public class ServerConnector extends PacketHandler
             String newHost = copiedHandshake.getHost() + "\00" + user.getAddress().getHostString() + "\00" + user.getUUID();
 
             LoginResult profile = user.getPendingConnection().getLoginProfile();
@ -117,5 +117,5 @@ index 6dca204..f5253b8 100644
      * The FML 1.8 handshake token.
      */
 -- 
-2.8.3
+2.7.4

--- a/BungeeCord-Patches/0019-Allow-invalid-packet-ids-for-forge-servers.patch
+++ b/BungeeCord-Patches/0019-Allow-invalid-packet-ids-for-forge-servers.patch
@ -1,4 +1,4 @@
-From b8216f418ad45f5f6ea8720c57a179fb28eaea26 Mon Sep 17 00:00:00 2001
+From f117ea4f68ef4f3dac10d17b1bc449d9180e9f4e 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
@ -62,7 +62,7 @@ index d15d4ed..db2843f 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 58c6956..b6e6365 100644
+index 08ee400..11953bb 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -29,7 +29,9 @@ import net.md_5.bungee.forge.ForgeUtils;
@ -73,9 +73,9 @@ index 58c6956..b6e6365 100644
 import net.md_5.bungee.protocol.DefinedPacket;
 +import net.md_5.bungee.protocol.MinecraftDecoder;
 import net.md_5.bungee.protocol.Protocol;
- import net.md_5.bungee.protocol.packet.BossBar;
 import net.md_5.bungee.protocol.packet.EncryptionRequest;
-@@ -183,6 +185,12 @@ public class ServerConnector extends PacketHandler
+ import net.md_5.bungee.protocol.packet.Handshake;
+@@ -182,6 +184,12 @@ public class ServerConnector extends PacketHandler
 
         ServerConnection server = new ServerConnection( ch, target );
         ServerConnectedEvent event = new ServerConnectedEvent( user, server );
@ -118,5 +118,5 @@ index 7eb48e0..f3c886a 100644
         {
             rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.8.3
+2.7.4

--- a/BungeeCord-Patches/0021-Add-basic-support-for-configurable-tab-complete-thro.patch
+++ b/BungeeCord-Patches/0021-Add-basic-support-for-configurable-tab-complete-thro.patch
@ -1,4 +1,4 @@
-From fc32e223b6d2932832929906d795490987e6318f Mon Sep 17 00:00:00 2001
+From 1e6e4deeec5e5bf1bdee09f83e0b54b65b774f3a Mon Sep 17 00:00:00 2001
 From: Johannes Donath <johannesd@torchmind.com>
 Date: Sat, 4 Jul 2015 06:31:33 +0200
 Subject: [PATCH] Add basic support for configurable tab-complete throttling
@ -64,10 +64,10 @@ index 1fa3ecd..23a5c94 100644
 +    }
 }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-index 7e1917f..11c6267 100644
+index 88b179d..b30fc3f 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-@@ -31,6 +31,8 @@ public class UpstreamBridge extends PacketHandler
+@@ -30,6 +30,8 @@ public class UpstreamBridge extends PacketHandler
     private final ProxyServer bungee;
     private final UserConnection con;
 
@ -76,7 +76,7 @@ index 7e1917f..11c6267 100644
     public UpstreamBridge(ProxyServer bungee, UserConnection con)
     {
         this.bungee = bungee;
-@@ -127,6 +129,16 @@ public class UpstreamBridge extends PacketHandler
+@@ -126,6 +128,16 @@ public class UpstreamBridge extends PacketHandler
     @Override
     public void handle(TabCompleteRequest tabComplete) throws Exception
     {
--- a/BungeeCord-Patches/0023-Optional-server-list-ping-logging.patch
+++ b/BungeeCord-Patches/0023-Optional-server-list-ping-logging.patch
@ -1,4 +1,4 @@
-From 56a64fd4435ed27505c72ef90cb96e83373e4774 Mon Sep 17 00:00:00 2001
+From b720eba7509edadcb62c935dfabe91e5b16966eb 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 23a5c94..114961d 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 b6e6365..e327325 100644
+index 11953bb..fc627cb 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -377,6 +377,6 @@ public class ServerConnector extends PacketHandler
+@@ -376,6 +376,6 @@ public class ServerConnector extends PacketHandler
     @Override
     public String toString()
     {
@ -85,7 +85,7 @@ index c7e75bf..a8e65fa 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 3fe1d23..501d5ba 100644
+index 068374a..177eefa 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
@@ -277,19 +277,22 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@ -122,10 +122,10 @@ index 3fe1d23..501d5ba 100644
 
     @Override
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-index 11c6267..0db7d17 100644
+index b30fc3f..9e912d2 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-@@ -212,6 +212,6 @@ public class UpstreamBridge extends PacketHandler
+@@ -211,6 +211,6 @@ public class UpstreamBridge extends PacketHandler
     @Override
     public String toString()
     {
--- a/BungeeCord-Patches/0026-Ignore-incoming-chat-messages-before-connecting-to-t.patch
+++ b/BungeeCord-Patches/0026-Ignore-incoming-chat-messages-before-connecting-to-t.patch
@ -1,4 +1,4 @@
-From 2b89dd0f47d01460bcc216f19be3b696c8d2de14 Mon Sep 17 00:00:00 2001
+From 7e0e1d30dce6f25daef1c4973d7b91b4b9127c2f Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Tue, 23 Jun 2015 21:56:13 +0200
 Subject: [PATCH] Ignore incoming chat messages before connecting to the
@ -7,7 +7,7 @@ Subject: [PATCH] Ignore incoming chat messages before connecting to the
 Merges SpigotMC/BungeeCord#1515

 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-index 0db7d17..11be7e9 100644
+index 9e912d2..7439bbc 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -2,6 +2,7 @@ package net.md_5.bungee.connection;
@ -18,7 +18,7 @@ index 0db7d17..11be7e9 100644
 import net.md_5.bungee.UserConnection;
 import net.md_5.bungee.Util;
 import net.md_5.bungee.api.ProxyServer;
-@@ -114,13 +115,21 @@ public class UpstreamBridge extends PacketHandler
+@@ -113,13 +114,21 @@ public class UpstreamBridge extends PacketHandler
     {
         Preconditions.checkArgument( chat.getMessage().length() <= 100, "Chat message too long" ); // Mojang limit, check on updates
 
--- a/BungeeCord-Patches/0027-Improve-connection-closing-fixing-the-kick-delay.patch
+++ b/BungeeCord-Patches/0027-Improve-connection-closing-fixing-the-kick-delay.patch
@ -1,4 +1,4 @@
-From 711c32e4db459754e39df0b6dbea885866c97ca1 Mon Sep 17 00:00:00 2001
+From 73c3ae42c73d5c711b380e8413dc9bb6abc2245e Mon Sep 17 00:00:00 2001
 From: kamcio96 <k.nadworski@icloud.com>
 Date: Mon, 14 Mar 2016 15:59:52 -0700
 Subject: [PATCH] Improve connection closing, fixing the kick delay.
@ -49,7 +49,7 @@ index c88ab49..9a13f5c 100644
             if ( server != null )
             {
 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 d3635cd..378231c 100644
+index 323428b..9d139c6 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
@@ -8,6 +8,7 @@ import java.net.URLEncoder;
@ -140,10 +140,10 @@ index d3635cd..378231c 100644
     }
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-index 50f0308..7565ff9 100644
+index 7439bbc..61be441 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-@@ -79,6 +79,7 @@ public class UpstreamBridge extends PacketHandler
+@@ -78,6 +78,7 @@ public class UpstreamBridge extends PacketHandler
             {
                 player.unsafe().sendPacket( packet );
             }
@ -223,5 +223,5 @@ index 06d19c3..76bdff2 100644
     {
         Preconditions.checkState( ch.eventLoop().inEventLoop(), "cannot add handler outside of event loop" );
 -- 
-2.7.4 (Apple Git-66)
+2.7.4

--- a/BungeeCord-Patches/0031-Validate-that-chat-messages-are-non-blank.patch
+++ b/BungeeCord-Patches/0031-Validate-that-chat-messages-are-non-blank.patch
@ -1,4 +1,4 @@
-From bad5f8b33244ab4ed5323ab193fed5ac3faa278b Mon Sep 17 00:00:00 2001
+From 904621bbf4a75d83aea28840449ee2fffaa69452 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Wed, 13 Apr 2016 14:00:40 -0400
 Subject: [PATCH] Validate that chat messages are non-blank
@ -33,7 +33,7 @@ index 0000000..940ad80
 +    }
 +}
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-index 80b9098..e4330d6 100644
+index 61be441..3849446 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
@@ -1,6 +1,7 @@
@ -44,7 +44,7 @@ index 80b9098..e4330d6 100644
 import net.md_5.bungee.BungeeCord;
 import net.md_5.bungee.ServerConnection;
 import net.md_5.bungee.UserConnection;
-@@ -115,6 +116,7 @@ public class UpstreamBridge extends PacketHandler
+@@ -114,6 +115,7 @@ public class UpstreamBridge extends PacketHandler
     public void handle(Chat chat) throws Exception
     {
         Preconditions.checkArgument( chat.getMessage().length() <= 100, "Chat message too long" ); // Mojang limit, check on updates
--- a/BungeeCord-Patches/0037-Improve-ServerKickEvent.patch
+++ b/BungeeCord-Patches/0037-Improve-ServerKickEvent.patch
@ -1,4 +1,4 @@
-From 948e114f61cfb4eacb6e3205f99354e10340de29 Mon Sep 17 00:00:00 2001
+From 991af33158771478cd68737173d4b9cc8e6cb566 Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Tue, 28 Jun 2016 23:00:49 -0500
 Subject: [PATCH] Improve ServerKickEvent
@ -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 e327325..d16fa57 100644
+index fc627cb..1af7071 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -302,7 +302,7 @@ public class ServerConnector extends PacketHandler
+@@ -301,7 +301,7 @@ public class ServerConnector extends PacketHandler
     public void handle(Kick kick) throws Exception
     {
         ServerInfo def = user.updateAndGetNextServer( target );
@ -135,5 +135,5 @@ index a8e65fa..4177ef5 100644
         {
             con.connectNow( event.getCancelServer() );
 -- 
-2.8.2
+2.7.4