mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-09-29 23:17:40 +02:00
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: 5972fd23 #3318: Fixed system messages shown in action bar for MC 1.19 clients 8c0e4b1d #3315: Further fix for offline mode support a737a754 Downgrade dependency version
This commit is contained in:
parent
59dbd0833d
commit
9c65274dab
@ -1 +1 @@
|
||||
Subproject commit fc8685a0427c5bb54c801f90f1d542f242036099
|
||||
Subproject commit 5972fd23533648161c13b6e81ca769b7af398568
|
@ -1,4 +1,4 @@
|
||||
From 5d176c6b2a2098239679debe4aa65787a553366c Mon Sep 17 00:00:00 2001
|
||||
From b5a7047196c619df8ba429d26988c77eea5b679f Mon Sep 17 00:00:00 2001
|
||||
From: Minecrell <minecrell@minecrell.net>
|
||||
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
|
||||
</modules>
|
||||
|
||||
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
|
||||
<groupId>net.sf.jopt-simple</groupId>
|
||||
<artifactId>jopt-simple</artifactId>
|
||||
@@ -130,6 +131,25 @@
|
||||
<version>1.8.0</version>
|
||||
<version>1.7.3</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
+ <!-- Waterfall start - Console improvements - bring back slf4j-->
|
||||
@ -1616,5 +1616,5 @@ index 21a48df6..00000000
|
||||
-
|
||||
-}
|
||||
--
|
||||
2.35.3
|
||||
2.36.1
|
||||
|
||||
|
@ -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)" <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 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();
|
||||
|
Loading…
Reference in New Issue
Block a user