Upstream
/
Waterfall
mirror of https://github.com/PaperMC/Waterfall.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated Upstream (BungeeCord) 

Upstream has released updates that appear 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:
bd8d1149 #3561: Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.0 to 3.6.2
30e12c6f #3560: Bump org.junit.jupiter:junit-jupiter from 5.10.0 to 5.10.1
bd009ca5 #3559: Fix serialisation of certain scoreboard packets < 1.13
65d8edf6 Minecraft 23w44a support
This commit is contained in:
Shane Freeder 2023-11-07 11:47:27 +00:00
parent be3a798a36
commit 9ac9f375b1
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
9 changed files with 38 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit f5157f12a4ac26a8f55ca50a276b6d457fc150a2
Subproject commit bd8d114992a674ffb861182c44bc5a1a6b083752

10
BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch
View File

@ -1,4 +1,4 @@
From eb1f1b27dbbd6f6831b35c21ecfb2cfe4a675da1 Mon Sep 17 00:00:00 2001
From de632d241ae895ad859c98bf12954a4c092f3b62 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
@ -43,10 +43,10 @@ index 70b292f0..91f71c09 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 5ca53d81..4f1011b9 100644
index 6d660bab..137d93cb 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -266,7 +266,7 @@ public class ServerConnector extends PacketHandler
@@ -267,7 +267,7 @@ public class ServerConnector extends PacketHandler
ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
@ -56,7 +56,7 @@ index 5ca53d81..4f1011b9 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 8f955fdc..3ff8e553 100644
index 172cc8e5..a16c48bb 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
@@ -300,7 +300,7 @@ public class DownstreamBridge extends PacketHandler
@ -82,5 +82,5 @@ index 5b9c35d1..2d6885a9 100644
{
@Override
--
2.42.0
2.42.1

6
BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch
View File

@ -1,4 +1,4 @@
From c4df62f75d45fdf60a1e171dc3d030a95537a581 Mon Sep 17 00:00:00 2001
From c8ca8bce23ed4223c0830d5ab3b2bed51c755e3d 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 4f1011b9..8a57c5a8 100644
index 137d93cb..ce925db2 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -7,6 +7,7 @@ import io.netty.buffer.ByteBufAllocator;
@ -23,7 +23,7 @@ index 4f1011b9..8a57c5a8 100644
import java.util.Queue;
import java.util.Set;
import java.util.UUID;
@@ -110,15 +111,39 @@ public class ServerConnector extends PacketHandler
@@ -111,15 +112,39 @@ public class ServerConnector extends PacketHandler
String newHost = copiedHandshake.getHost() + "\00" + AddressUtil.sanitizeAddress( user.getAddress() ) + "\00" + user.getUUID();
LoginResult profile = user.getPendingConnection().getLoginProfile();

22
BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch
View File

@ -1,4 +1,4 @@
From dde015048a91f44a859189f590147b9244de3f80 Mon Sep 17 00:00:00 2001
From c900fddebb1bbe7539c16204f74c9565840d4427 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,27 +66,17 @@ index 2eeca50b..9bd62ceb 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 8a57c5a8..b856647f 100644
index ce925db2..6db704bd 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -35,7 +35,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;
+import net.md_5.bungee.netty.PipelineUtils;
import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.MinecraftDecoder;
import net.md_5.bungee.protocol.PacketWrapper;
import net.md_5.bungee.protocol.Protocol;
import net.md_5.bungee.protocol.ProtocolConstants;
@@ -223,6 +225,12 @@ public class ServerConnector extends PacketHandler
@@ -224,6 +224,12 @@ public class ServerConnector extends PacketHandler
public static void handleLogin(ProxyServer bungee, ChannelWrapper ch, UserConnection user, BungeeServerInfo target, ForgeServerHandler handshakeHandler, ServerConnection server, Login login) throws Exception
{
ServerConnectedEvent event = new ServerConnectedEvent( user, server );
+
+ if (server.isForgeServer() && user.isForgeUser()) {
+ ((MinecraftDecoder) server.getCh().getHandle().pipeline().get(PipelineUtils.PACKET_DECODER)).setSupportsForge(true);
+ ((MinecraftDecoder) user.getCh().getHandle().pipeline().get(PipelineUtils.PACKET_DECODER)).setSupportsForge(true);
+ ((net.md_5.bungee.protocol.MinecraftDecoder) server.getCh().getHandle().pipeline().get(net.md_5.bungee.netty.PipelineUtils.PACKET_DECODER)).setSupportsForge(true);
+ ((net.md_5.bungee.protocol.MinecraftDecoder) user.getCh().getHandle().pipeline().get(net.md_5.bungee.netty.PipelineUtils.PACKET_DECODER)).setSupportsForge(true);
+ }
+
bungee.getPluginManager().callEvent( event );
@ -110,5 +100,5 @@ index 9a47f2ec..b768d54a 100644
{
rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
--
2.42.0
2.42.1

8
BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch
View File

@ -1,4 +1,4 @@
From 2e0ec517eacbbb7821e7b508d6b844779873e00a Mon Sep 17 00:00:00 2001
From 1932cedf8e7963d4f1107147f37d4376fa716995 Mon Sep 17 00:00:00 2001
From: Janmm14 <computerjanimaus@yahoo.de>
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 b856647f..7f1992df 100644
index 6db704bd..53eac723 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -503,6 +503,6 @@ public class ServerConnector extends PacketHandler
@@ -507,6 +507,6 @@ public class ServerConnector extends PacketHandler
@Override
public String toString()
{
@ -19,7 +19,7 @@ index b856647f..7f1992df 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 cee4c235..6c545f4c 100644
index 6f74ed82..6f447b6d 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
@@ -777,6 +777,6 @@ public class DownstreamBridge extends PacketHandler

10
BungeeCord-Patches/0025-Improve-ServerKickEvent.patch
View File

@ -1,4 +1,4 @@
From 6811ade86ab79cff19ddbdd895abab13d3863f09 Mon Sep 17 00:00:00 2001
From 2edfba28d1e4a68d6253a0db84a2685af6882041 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
@ -68,10 +68,10 @@ index 3f9efaa8..5d2597ad 100644
/**
* @return the kick reason
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 7f1992df..fd1f9266 100644
index 53eac723..a1f5c709 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -420,7 +420,7 @@ public class ServerConnector extends PacketHandler
@@ -424,7 +424,7 @@ public class ServerConnector extends PacketHandler
ServerKickEvent event = new ServerKickEvent( user, target, new BaseComponent[]
{
kick.getMessage()
@ -81,7 +81,7 @@ index 7f1992df..fd1f9266 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 6c545f4c..f461c096 100644
index 6f447b6d..3df0f26c 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
@@ -97,16 +97,19 @@ public class DownstreamBridge extends PacketHandler
@ -147,5 +147,5 @@ index 6c545f4c..f461c096 100644
{
con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
--
2.42.0
2.42.1

16
BungeeCord-Patches/0044-Provide-an-option-to-disable-entity-metadata-rewriti.patch
View File

@ -1,4 +1,4 @@
From 15b34952e52fec2a6910f67870f79a96aaeb316c Mon Sep 17 00:00:00 2001
From 864a8a831340faf45c4db8f6db6dd25e078e72d5 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
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 fd1f9266..1f30a5cb 100644
index a1f5c709..f43aee8c 100644
--- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
+++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
@@ -255,7 +255,8 @@ public class ServerConnector extends PacketHandler
@@ -254,7 +254,8 @@ public class ServerConnector extends PacketHandler
ch.write( new PluginMessage( user.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:register" : "REGISTER", Joiner.on( "\0" ).join( registeredChannels ).getBytes( StandardCharsets.UTF_8 ), false ) );
}
@ -70,15 +70,15 @@ index fd1f9266..1f30a5cb 100644
{
ch.write( user.getSettings() );
}
@@ -310,6 +311,7 @@ public class ServerConnector extends PacketHandler
@@ -309,6 +310,7 @@ public class ServerConnector extends PacketHandler
user.getTabListHandler().onServerChange();
Scoreboard serverScoreboard = user.getServerSentScoreboard();
+ if ( !user.isDisableEntityMetadataRewrite() ) { // Waterfall
for ( Objective objective : serverScoreboard.getObjectives() )
{
user.unsafe().sendPacket( new ScoreboardObjective( objective.getName(), ComponentSerializer.deserialize( objective.getValue() ), ScoreboardObjective.HealthDisplay.fromString( objective.getType() ), (byte) 1 ) );
@@ -322,6 +324,7 @@ public class ServerConnector extends PacketHandler
user.unsafe().sendPacket( new ScoreboardObjective(
@@ -326,6 +328,7 @@ public class ServerConnector extends PacketHandler
{
user.unsafe().sendPacket( new net.md_5.bungee.protocol.packet.Team( team.getName() ) );
}
@ -86,7 +86,7 @@ index fd1f9266..1f30a5cb 100644
serverScoreboard.clear();
for ( UUID bossbar : user.getSentBossBars() )
@@ -340,13 +343,34 @@ public class ServerConnector extends PacketHandler
@@ -344,13 +347,34 @@ public class ServerConnector extends PacketHandler
}
user.setDimensionChange( true );
@ -138,7 +138,7 @@ index a5ddcdc3..1d3b7a9d 100644
+ // Waterfall end
}
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 80275a15..bc808b2c 100644
index 4b812092..e8c7e2f2 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
@@ -744,6 +744,7 @@ public class DownstreamBridge extends PacketHandler

6
BungeeCord-Patches/0048-Speed-up-some-common-exceptions.patch
View File

@ -1,4 +1,4 @@
From 165e3084653c4f024cdb4b0cb11844e8392e521e Mon Sep 17 00:00:00 2001
From 7edb3d8862d8e76629943d7e5cddcfb86a745434 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 25 Nov 2019 19:54:06 +0000
Subject: [PATCH] Speed up some common exceptions
@ -67,7 +67,7 @@ index 6c0ef4df..f20104a2 100644
+ // Waterfall end
}
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
index ee323696..44bec3b5 100644
index ad7f9c25..5cf0d5b7 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
@@ -27,6 +27,9 @@ import se.llbit.nbt.Tag;
@ -80,7 +80,7 @@ index ee323696..44bec3b5 100644
public static void writeString(String s, ByteBuf buf)
{
writeString( s, buf, Short.MAX_VALUE );
@@ -185,13 +188,18 @@ public abstract class DefinedPacket
@@ -201,13 +204,18 @@ public abstract class DefinedPacket
byte in;
while ( true )
{

6
BungeeCord-Patches/0055-Additional-DoS-mitigations.patch
View File

@ -1,4 +1,4 @@
From 0c9617c8a323198bdc66b4aa88b62999606f3451 Mon Sep 17 00:00:00 2001
From af84573e0b63459feb9994b969276a9f0bbad09c Mon Sep 17 00:00:00 2001
From: "Five (Xer)" <admin@fivepb.me>
Date: Sat, 30 Jan 2021 18:04:14 +0100
Subject: [PATCH] Additional DoS mitigations
@ -8,7 +8,7 @@ Courtesy of Tux and the Velocity Contributors. See:
https://github.com/VelocityPowered/Velocity/commit/5ceac16a821ea35572ff11412ace8929fd06e278
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
index 3376154d..d3c66f68 100644
index 5cf0d5b7..52c2d940 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
@@ -62,6 +62,7 @@ public abstract class DefinedPacket
@ -27,7 +27,7 @@ index 3376154d..d3c66f68 100644
throw new OverflowPacketException( "Cannot receive string longer than " + maxLen + " (got " + s.length() + " characters)" );
}
@@ -478,4 +480,21 @@ public abstract class DefinedPacket
@@ -494,4 +496,21 @@ public abstract class DefinedPacket
@Override
public abstract String toString();