Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-11 19:37:15 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (BungeeCord)

Browse Source 
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:
0925c06f #3563: Correct max string length for reading SystemChat packets
This commit is contained in:
Shane Freeder 2023-11-15 16:19:21 +00:00
parent 50f0a75e0a
commit 8d63c61160
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 16298a75f29812e031e57beb8cc7fbc57ab0bb24 Subproject commit 0925c06f9b1eaeba7e0028e3cbacb15991a2e075

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

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

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

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