mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-12-11 19:37:15 +01:00
be3a798a36
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: f5157f12 #3438: Fix possible race condition in duplicate player check df20effa #3557: Replace Guava Charsets with Java StandardCharsets
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
From a00f92b9ec6d2073ae2e4abd426d65d971611907 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 6c83039d..553680ee 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
|
|
@@ -426,7 +426,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.42.1
|
|
|