diff --git a/BungeeCord b/BungeeCord index fc8685a..5972fd2 160000 --- a/BungeeCord +++ b/BungeeCord @@ -1 +1 @@ -Subproject commit fc8685a0427c5bb54c801f90f1d542f242036099 +Subproject commit 5972fd23533648161c13b6e81ca769b7af398568 diff --git a/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch b/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch index b5bd1c7..f35d34c 100644 --- a/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch +++ b/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch @@ -1,4 +1,4 @@ -From 5d176c6b2a2098239679debe4aa65787a553366c Mon Sep 17 00:00:00 2001 +From b5a7047196c619df8ba429d26988c77eea5b679f Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 22 Sep 2017 12:46:47 +0200 Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for @@ -206,7 +206,7 @@ index 00000000..e43f5dac +log4j.skipJansi=true diff --git a/log4j/src/main/resources/log4j2.xml b/log4j/src/main/resources/log4j2.xml new file mode 100644 -index 00000000..e32dd7b5 +index 00000000..cfd039cd --- /dev/null +++ b/log4j/src/main/resources/log4j2.xml @@ -0,0 +1,22 @@ @@ -251,7 +251,7 @@ index fad424b6..2b544c23 100644 diff --git a/proxy/pom.xml b/proxy/pom.xml -index 8506b681..205162db 100644 +index 62444984..d81bf730 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -71,7 +71,7 @@ @@ -279,7 +279,7 @@ index 8506b681..205162db 100644 net.sf.jopt-simple jopt-simple @@ -130,6 +131,25 @@ - 1.8.0 + 1.7.3 runtime + @@ -1616,5 +1616,5 @@ index 21a48df6..00000000 - -} -- -2.35.3 +2.36.1 diff --git a/BungeeCord-Patches/0057-Additional-DoS-mitigations.patch b/BungeeCord-Patches/0057-Additional-DoS-mitigations.patch index b902f1e..d7d7981 100644 --- a/BungeeCord-Patches/0057-Additional-DoS-mitigations.patch +++ b/BungeeCord-Patches/0057-Additional-DoS-mitigations.patch @@ -1,4 +1,4 @@ -From 8e2cfd0d45e5be308cda5f55ca6093fb90c7bbfe Mon Sep 17 00:00:00 2001 +From b901ef5501cdc65df1f175d700576641063fdff4 Mon Sep 17 00:00:00 2001 From: "Five (Xer)" 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 18e548df..55c6ee72 100644 +index c4af6e76..bafef27c 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 @@ -44,6 +44,7 @@ public abstract class DefinedPacket @@ -27,7 +27,7 @@ index 18e548df..55c6ee72 100644 throw new OverflowPacketException( "Cannot receive string longer than " + maxLen + " (got " + s.length() + " characters)" ); } -@@ -345,4 +347,21 @@ public abstract class DefinedPacket +@@ -351,4 +353,21 @@ public abstract class DefinedPacket @Override public abstract String toString();