Upstream/Waterfall
1
0
Fork 0
mirror of https://github.com/PaperMC/Waterfall.git synced 2024-12-12 11:56:53 +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:
862bb2ac #3258: Only show detailed connect exception to admins
This commit is contained in:
Shane Freeder 2022-04-25 17:52:14 +01:00
parent 4015f55f2c
commit 2322301e63
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit 34d416a4e8d6f6d73c8fd6ff8df3ffcefc2b34f2 Subproject commit 862bb2ac72fbabafb40935f9b7eb44a6faea061a

17
BungeeCord-Patches/0063-Don-t-send-exceptions-to-the-client-during-kicks-etc.patch
View File

@ -1,4 +1,4 @@
From 951b7e18e37abebc4c74643aaa820648114f0343 Mon Sep 17 00:00:00 2001 From 5b153f56ace64a77b2194c64ea8948c536872998 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 22 Mar 2022 14:56:44 +0000 Date: Tue, 22 Mar 2022 14:56:44 +0000
Subject: [PATCH] Don't send exceptions to the client during kicks, etc Subject: [PATCH] Don't send exceptions to the client during kicks, etc
@ -13,22 +13,19 @@ allows for retaining much of the overall context here, i.e. who
was this exception assocated with? 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 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 4a858f31..0d6aff64 100644 index 888218a0..7c52ee9a 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -398,7 +398,11 @@ public final class UserConnection implements ProxiedPlayer @@ -398,7 +398,8 @@ public final class UserConnection implements ProxiedPlayer
private String connectionFailMessage(Throwable cause) private String connectionFailMessage(Throwable cause)
{ {
- return Util.exception( cause, false ); - return groups.contains( "admin" ) ? Util.exception( cause, false ) : cause.getClass().getName();
+ // Waterfall start + bungee.getLogger().log(Level.WARNING, "Error occurred processing connection for " + this.name + " " + Util.exception( cause, false )); // Waterfall
+ cause.printStackTrace(); + return ""; // Waterfall
+ return "";
+ //return Util.exception( cause, false );
+ // Waterfall end
} }
@Override @Override
-- --
2.35.1 2.36.0