Updated Upstream (BungeeCord)

Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: e2bc7ed7 Misc formatting fixes 9133a6f5 Simplify packet registration
2024-11-19 00:35:55 +01:00 · 2019-02-26 19:53:11 +00:00 · 2019-02-26 19:53:11 +00:00 · f2cd0938da
commit f2cd0938da
parent 0874931518
5 changed files with 41 additions and 30 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 6d6fbb5efa06259166cc2e6f56e6320bf0d6316d
+Subproject commit e2bc7ed797c5e8d76d61339d0eb1f067521e5bb7
--- a/BungeeCord-Patches/0008-Fixup-ProtocolConstants.patch
+++ b/BungeeCord-Patches/0008-Fixup-ProtocolConstants.patch
@ -1,24 +1,14 @@
-From 2d75ec272a93dc6da8d56876fc5545b438c185ee Mon Sep 17 00:00:00 2001
+From dd1e4f5703b3e243d5e6cc45670f2c5b41128b76 Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Tue, 15 Nov 2016 09:07:51 -0500
 Subject: [PATCH] Fixup ProtocolConstants


 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
-index 2cc86349..d9a3c7e5 100644
+index 09c2bebf..d9a3c7e5 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
-@@ -28,7 +28,8 @@ public class ProtocolConstants
-             "1.12.x",
-             "1.13.x"
-     );
-    public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList( ProtocolConstants.MINECRAFT_1_8,
-+    public static final List<Integer> SUPPORTED_VERSION_IDS = Arrays.asList(
-+            ProtocolConstants.MINECRAFT_1_8,
-             ProtocolConstants.MINECRAFT_1_9,
-             ProtocolConstants.MINECRAFT_1_9_1,
-             ProtocolConstants.MINECRAFT_1_9_2,
-@@ -44,6 +45,16 @@ public class ProtocolConstants
+@@ -45,6 +45,16 @@ public class ProtocolConstants
             ProtocolConstants.MINECRAFT_1_13_2
     );
 
@ -36,5 +26,5 @@ index 2cc86349..d9a3c7e5 100644
     {
 
 -- 
-2.19.1
+2.21.0

--- a/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch
+++ b/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch
@ -1,4 +1,4 @@
-From d1f6fc4f1cc1bc41e9e321fbc3c3ab7a6807a1c7 Mon Sep 17 00:00:00 2001
+From 9e9254228993e2de0601a0644dac5b8abf0491ca 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
@ -37,11 +37,11 @@ index ea44573d..5b32effe 100644
             {
                 packet.read( in, prot.getDirection(), protocolVersion );
 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 e6c3729c..af6a6d40 100644
+index 56d8a0de..fac02784 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
-@@ -408,14 +408,23 @@ public enum Protocol
-             return protocol;
+@@ -359,14 +359,23 @@ public enum Protocol
+             }
         }
 
 +        public boolean hasPacket(int i, boolean supportsForge) {
@ -55,10 +55,10 @@ index e6c3729c..af6a6d40 100644
 +
 +        public final DefinedPacket createPacket(int id, int version, boolean supportsForge)
         {
-             ProtocolData protocolData = getProtocolData( version );
+             ProtocolData protocolData = protocols.get( version );
             if ( protocolData == null )
             {
-                 throw new BadPacketException( "Unsupported protocol version" );
+                 throw new BadPacketException( "Unsupported protocol version " + version );
             }
 -            if ( id > MAX_PACKET_ID )
 +            if ( !hasPacket(id, supportsForge) )
@ -122,5 +122,5 @@ index 1ecee69e..994670cd 100644
         {
             rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.20.1
+2.21.0

--- a/BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch
+++ b/BungeeCord-Patches/0033-Fix-potion-race-condition-on-Forge-1.8.9.patch
@ -1,4 +1,4 @@
-From 30a0215378f22fc5dfeda5fce5de783801d21763 Mon Sep 17 00:00:00 2001
+From 048c8c798e9623855157222e4f535208e1c0d081 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
@ -33,10 +33,10 @@ index 219488dd..bef7b370 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 1161dc5d..39affec6 100644
+index fac02784..52ee3461 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
-@@ -18,6 +18,8 @@ import net.md_5.bungee.protocol.packet.Commands;
+@@ -15,6 +15,8 @@ import net.md_5.bungee.protocol.packet.Commands;
 import net.md_5.bungee.protocol.packet.EncryptionRequest;
 import net.md_5.bungee.protocol.packet.EncryptionResponse;
 import net.md_5.bungee.protocol.packet.EntityStatus;
@ -45,9 +45,9 @@ index 1161dc5d..39affec6 100644
 import net.md_5.bungee.protocol.packet.Handshake;
 import net.md_5.bungee.protocol.packet.KeepAlive;
 import net.md_5.bungee.protocol.packet.Kick;
-@@ -96,6 +98,26 @@ public enum Protocol
-                     map( ProtocolConstants.MINECRAFT_1_12, 0x0C ),
-                     map( ProtocolConstants.MINECRAFT_1_13, 0x0C )
+@@ -88,6 +90,26 @@ public enum Protocol
+                     BossBar.class,
+                     map( ProtocolConstants.MINECRAFT_1_9, 0x0C )
             );
 +            // Waterfall start
 +            TO_CLIENT.registerPacket(
@ -191,7 +191,7 @@ index 6dae9a88..9c872a1c 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 14ab7f58..9737a8d2 100644
+index 522f93c7..f635a7e4 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
@@ -49,6 +49,8 @@ import net.md_5.bungee.protocol.PacketWrapper;
@ -274,5 +274,5 @@ index 0d683856..c1272da3 100644
      * Sends the server mod list to the client, or stores it for sending later.
      *
 -- 
-2.20.1
+2.21.0

--- a/BungeeCord-Patches/0048-fixup-Fix-potion-race-condition-on-Forge-1.8.9.patch
+++ b/BungeeCord-Patches/0048-fixup-Fix-potion-race-condition-on-Forge-1.8.9.patch
@ -0,0 +1,21 @@
+From be1c40f01873b60d3b96692fb54594c6fc7dc7bd Mon Sep 17 00:00:00 2001
+From: Shane Freeder <theboyetronic@gmail.com>
+Date: Tue, 26 Feb 2019 19:36:42 +0000
+Subject: [PATCH] fixup! Fix potion race condition on Forge 1.8.9
+
+
+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 52ee3461..4966d0a5 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
+@@ -96,7 +96,6 @@ public enum Protocol
+                     map(ProtocolConstants.MINECRAFT_1_8, 0x1D),
+                     map(ProtocolConstants.MINECRAFT_1_9, 0x4C),
+                     map(ProtocolConstants.MINECRAFT_1_9_4, 0x4B),
+-                    map(ProtocolConstants.MINECRAFT_1_10, 0x4B),
+                     map(ProtocolConstants.MINECRAFT_1_12, 0x4E),
+                     map(ProtocolConstants.MINECRAFT_1_12_1, 0x4F),
+                     map(ProtocolConstants.MINECRAFT_1_13, 0x53)
+-- 
+2.21.0
+