mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-11-06 10:45:37 +01:00
d75d7d1edc
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by 2LStudios and as with ANY update, please do your own testing Waterfall Changes:a5c78a9(Maybe) Fix javadoc searcheb920b8Updated Upstream (BungeeCord)8e9b90afix compile-native not working on linuxee819dfUpdated Upstream (BungeeCord)66601f7[ci skip] link to javadocs page instead of attempting direct
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
From 8b3e6f968ad9a19466653d9a08b31da13567b6d2 Mon Sep 17 00:00:00 2001
|
|
From: foss-mc <69294560+foss-mc@users.noreply.github.com>
|
|
Date: Wed, 16 Dec 2020 18:40:55 +0800
|
|
Subject: [PATCH] Change IllegalStateException to QuietException and explain
|
|
that is a plugin
|
|
|
|
|
|
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 fc98b4b1..db79b58a 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
|
|
@@ -310,7 +310,8 @@ public final class UserConnection implements ProxiedPlayer
|
|
|
|
if ( getServer() == null && !ch.isClosing() )
|
|
{
|
|
- throw new IllegalStateException( "Cancelled ServerConnectEvent with no server or disconnect." );
|
|
+ // FlameCord - Change IllegalStateException to QuietException and explain that is a plugin
|
|
+ throw new QuietException("A plugin cancelled ServerConnectEvent with no server or disconnect.");
|
|
}
|
|
return;
|
|
}
|
|
--
|
|
2.32.0.windows.1
|
|
|