mirror of
https://github.com/PaperMC/Waterfall.git
synced 2025-02-16 03:41:20 +01:00
1efb2d439e
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: d0fa62d4 Minecraft 24w06a support 464ed018 Improve cookie support during login eda268b4 Fix 24w05b spectate packet ID 3e100752 #3612: Error when disconnecting player on PostLoginEvent b52b1469 Add PendingConnection#isTransferred API method 94d5b0d0 Minecraft 24w05b support c3f228f6 #3610, 3611: inverted isEmpty method on ComponentStyle 02c5c1ee #3602: Minecraft 24w04a support c69acf72 Add JetBrains java-annotations a1cd6943 Bump version to 1.20-R0.3-SNAPSHOT 3e2bc8e2 Release 1.20-R0.2 ad7163d2 #3600: Bump io.netty:netty-bom from 4.1.104.Final to 4.1.106.Final
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
From 91068a14930a6dea6267c8cc6c435b555d3d9b32 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Tue, 22 Mar 2022 14:56:44 +0000
|
|
Subject: [PATCH] Don't send exceptions to the client during kicks, etc
|
|
|
|
The info here is often not filtered down and can often contain
|
|
internal information during these kicks which server owners are
|
|
generally not happy with sharing, i.e. potential IP addresses, etc
|
|
|
|
We'll have to dump the cause to the console manually to ensure that
|
|
data is still sent, but, a wider fix here is probably needed which
|
|
allows for retaining much of the overall context here, i.e. who
|
|
was this exception assocated with?
|
|
|
|
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 2813c16f..f29a6f62 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
|
|
@@ -429,7 +429,8 @@ public final class UserConnection implements ProxiedPlayer
|
|
|
|
private String connectionFailMessage(Throwable cause)
|
|
{
|
|
- return groups.contains( "admin" ) ? Util.exception( cause, false ) : cause.getClass().getName();
|
|
+ bungee.getLogger().log(Level.WARNING, "Error occurred processing connection for " + this.name + " " + Util.exception( cause, false )); // Waterfall
|
|
+ return ""; // Waterfall
|
|
}
|
|
|
|
@Override
|
|
--
|
|
2.43.0.windows.1
|
|
|