diff --git a/BungeeCord b/BungeeCord index 4f23b49..a7c6ede 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit 4f23b49fef8d30e0f1bdc045575e757ee0d2506f +Subproject commit a7c6edeb638f0a2ba4fb051f2b0be5a6e226c955 diff --git a/BungeeCord-Patches/0010-Don-t-access-a-ByteBuf-s-underlying-array.patch b/BungeeCord-Patches/0010-Don-t-access-a-ByteBuf-s-underlying-array.patch index ec48aa9..d1c5220 100644 --- a/BungeeCord-Patches/0010-Don-t-access-a-ByteBuf-s-underlying-array.patch +++ b/BungeeCord-Patches/0010-Don-t-access-a-ByteBuf-s-underlying-array.patch @@ -1,4 +1,4 @@ -From 9d02ba002fd6cce2b8888b68ea1693c944f199c3 Mon Sep 17 00:00:00 2001 +From 53eb2f19e3de4b0b3967e8844f0b9d38b48dda04 Mon Sep 17 00:00:00 2001 From: Techcable Date: Tue, 3 May 2016 20:31:52 -0700 Subject: [PATCH] Don't access a ByteBuf's underlying array @@ -43,10 +43,10 @@ index c01cf317..17e12655 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 15b2ba0d..ec8a6018 100644 +index fa2ceec5..94b3e7ad 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -@@ -237,7 +237,7 @@ public class ServerConnector extends PacketHandler +@@ -239,7 +239,7 @@ public class ServerConnector extends PacketHandler { ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer(); DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand ); @@ -56,7 +56,7 @@ index 15b2ba0d..ec8a6018 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 a575b634..653242f0 100644 +index 4c03bfb2..552b0b17 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 @@ -268,7 +268,7 @@ public class DownstreamBridge extends PacketHandler @@ -86,5 +86,5 @@ index afc2c12a..c0f7980b 100644 { @Override -- -2.24.0 +2.30.1 diff --git 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 index 71105c5..22ce183 100644 --- 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 ea20858832ab1b742e5a570cf3a6acaeee84db32 Mon Sep 17 00:00:00 2001 +From 5eadc25a50a7b865b64f07b65d293c1ae5b25db4 Mon Sep 17 00:00:00 2001 From: Daniel Naylor 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 6ed2bf92..674de454 100644 +index 94b3e7ad..bafd741b 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -5,6 +5,7 @@ import io.netty.buffer.ByteBuf; @@ -23,7 +23,7 @@ index 6ed2bf92..674de454 100644 import java.util.Queue; import java.util.Set; import java.util.UUID; -@@ -103,15 +104,39 @@ public class ServerConnector extends PacketHandler +@@ -105,15 +106,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 6ed2bf92..674de454 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 bb62e27d..e77804f8 100644 +index 90bfc8cb..e0b48763 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -163,8 +163,12 @@ public final class UserConnection implements ProxiedPlayer @@ -100,5 +100,5 @@ index 6dca2048..f5253b89 100644 * The FML 1.8 handshake token. */ -- -2.25.0 +2.30.1 diff --git a/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch b/BungeeCord-Patches/0017-Allow-invalid-packet-ids-for-forge-servers.patch index 91123c0..f989827 100644 --- 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 04107f2b83ed39c27c21936d2c1b4d129e1a52c6 Mon Sep 17 00:00:00 2001 +From ce2efc22510538721c07bb4ba4d6cebe5da85885 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 19 May 2016 17:09:22 -0600 Subject: [PATCH] Allow invalid packet ids for forge servers @@ -66,7 +66,7 @@ index caf4a685..50a911c2 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 3a24c100..eb8ae99a 100644 +index bafd741b..4d0fa540 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -32,7 +32,9 @@ import net.md_5.bungee.forge.ForgeUtils; @@ -79,7 +79,7 @@ index 3a24c100..eb8ae99a 100644 import net.md_5.bungee.protocol.PacketWrapper; import net.md_5.bungee.protocol.Protocol; import net.md_5.bungee.protocol.ProtocolConstants; -@@ -203,6 +205,12 @@ public class ServerConnector extends PacketHandler +@@ -205,6 +207,12 @@ public class ServerConnector extends PacketHandler ServerConnection server = new ServerConnection( ch, target ); ServerConnectedEvent event = new ServerConnectedEvent( user, server ); @@ -122,5 +122,5 @@ index 53911d1c..4a27148f 100644 { rewriteInt( packet, oldId, newId, readerIndex + packetIdLength ); -- -2.29.2 +2.30.1 diff --git a/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch b/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch index 2990aba..5686c2a 100644 --- a/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch +++ b/BungeeCord-Patches/0020-Improve-server-list-ping-logging.patch @@ -1,4 +1,4 @@ -From 7746bcf3c90d6015eb497d3eb2a27b8102df6d9e Mon Sep 17 00:00:00 2001 +From d1dfa00c6432e63e237cce989cc336b1df712b5d Mon Sep 17 00:00:00 2001 From: Janmm14 Date: Sat, 12 Dec 2015 23:43:30 +0100 Subject: [PATCH] Improve server list ping logging @@ -7,10 +7,10 @@ This functionality of this patch was adopted upstream, however, this patch remains for a few misc improvements around here 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 eb8ae99a..934ad406 100644 +index 4d0fa540..8a5eae3a 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -@@ -442,6 +442,6 @@ public class ServerConnector extends PacketHandler +@@ -450,6 +450,6 @@ public class ServerConnector extends PacketHandler @Override public String toString() { @@ -31,7 +31,7 @@ index a859195e..b9783a4c 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 853d717a..7ca502c0 100644 +index c2cebd6b..fb410f20 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 @@ -653,20 +653,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection @@ -69,5 +69,5 @@ index 49fec0d7..a2f36f23 100644 } } -- -2.28.0 +2.30.1 diff --git a/BungeeCord-Patches/0027-Improve-ServerKickEvent.patch b/BungeeCord-Patches/0027-Improve-ServerKickEvent.patch index b97407e..39df4bf 100644 --- a/BungeeCord-Patches/0027-Improve-ServerKickEvent.patch +++ b/BungeeCord-Patches/0027-Improve-ServerKickEvent.patch @@ -1,4 +1,4 @@ -From d59223808d72f9b5f6b869a17a91260a6a3acaee Mon Sep 17 00:00:00 2001 +From 686623652c10c78317a260bedb8d11ec5c47bacf Mon Sep 17 00:00:00 2001 From: Nathan Poirier Date: Tue, 28 Jun 2016 23:00:49 -0500 Subject: [PATCH] Improve ServerKickEvent @@ -62,10 +62,10 @@ index 0e1ef5c4..ee63732d 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 934ad406..2b762d4f 100644 +index 8a5eae3a..f304f991 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -@@ -365,7 +365,7 @@ public class ServerConnector extends PacketHandler +@@ -367,7 +367,7 @@ public class ServerConnector extends PacketHandler public void handle(Kick kick) throws Exception { ServerInfo def = user.updateAndGetNextServer( target ); @@ -146,5 +146,5 @@ index b9783a4c..757a595b 100644 { con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT ); -- -2.28.0 +2.30.1 diff --git a/BungeeCord-Patches/0046-Provide-an-option-to-disable-entity-metadata-rewriti.patch b/BungeeCord-Patches/0046-Provide-an-option-to-disable-entity-metadata-rewriti.patch index 9ef7a7d..c190c35 100644 --- a/BungeeCord-Patches/0046-Provide-an-option-to-disable-entity-metadata-rewriti.patch +++ b/BungeeCord-Patches/0046-Provide-an-option-to-disable-entity-metadata-rewriti.patch @@ -1,4 +1,4 @@ -From 8ae1e11318da696e5ef26a771ffad961adb17931 Mon Sep 17 00:00:00 2001 +From 6d01261c6f3846eb751d212196efbdc8d4efc030 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 14 Jan 2019 03:35:21 +0000 Subject: [PATCH] Provide an option to disable entity metadata rewriting @@ -57,10 +57,10 @@ index 4ff8da6d..e860214f 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 2b762d4f..b486f2aa 100644 +index f304f991..2d9c0cda 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java -@@ -228,7 +228,7 @@ public class ServerConnector extends PacketHandler +@@ -230,7 +230,7 @@ public class ServerConnector extends PacketHandler ch.write( message ); } @@ -69,7 +69,7 @@ index 2b762d4f..b486f2aa 100644 { ch.write( user.getSettings() ); } -@@ -281,6 +281,7 @@ public class ServerConnector extends PacketHandler +@@ -283,6 +283,7 @@ public class ServerConnector extends PacketHandler user.getTabListHandler().onServerChange(); Scoreboard serverScoreboard = user.getServerSentScoreboard(); @@ -77,7 +77,7 @@ index 2b762d4f..b486f2aa 100644 for ( Objective objective : serverScoreboard.getObjectives() ) { user.unsafe().sendPacket( new ScoreboardObjective( objective.getName(), objective.getValue(), ScoreboardObjective.HealthDisplay.fromString( objective.getType() ), (byte) 1 ) ); -@@ -293,6 +294,7 @@ public class ServerConnector extends PacketHandler +@@ -295,6 +296,7 @@ public class ServerConnector extends PacketHandler { user.unsafe().sendPacket( new net.md_5.bungee.protocol.packet.Team( team.getName() ) ); } @@ -85,7 +85,7 @@ index 2b762d4f..b486f2aa 100644 serverScoreboard.clear(); for ( UUID bossbar : user.getSentBossBars() ) -@@ -311,12 +313,35 @@ public class ServerConnector extends PacketHandler +@@ -313,12 +315,35 @@ public class ServerConnector extends PacketHandler } user.setDimensionChange( true ); @@ -234,5 +234,5 @@ index 00000000..cb81d1dd +// Waterfall end \ No newline at end of file -- -2.29.2 +2.30.1