summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/aizistral/nochatreports
diff options
context:
space:
mode:
authorMadis2022-09-03 14:00:16 +0300
committerMadis2022-09-03 14:00:16 +0300
commit6d06e360464b0924d319ea6fa64cb0b12fd60be3 (patch)
tree84dd4293d95862b96475b358368c126765832091 /src/main/java/com/aizistral/nochatreports
parent229ef3a4677e25b3220796569b1af88b9d693400 (diff)
BungeeCord/Waterfall exception
Diffstat (limited to 'src/main/java/com/aizistral/nochatreports')
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
index e068559..423efa0 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
@@ -41,6 +41,12 @@ public final class NoChatReportsClient implements ClientModInitializer {
"multiplayer.disconnect.invalid_public_key_signature",
"multiplayer.disconnect.invalid_public_key"
);
+
+ private static final List<String> STRING_DISCONNECT_REASONS = ImmutableList.of(
+ "A secure profile is required to join this server.",
+ "Secure profile expired.",
+ "Secure profile invalid."
+ );
private static boolean screenOverride = false;
@Override
@@ -58,14 +64,15 @@ public final class NoChatReportsClient implements ClientModInitializer {
return;
screenOverride = true;
- if (dsc.getReason().getContents() instanceof TranslatableContents contents) {
+ var disconnectReason = dsc.getReason();
+ if (disconnectReason != null) {
if (ServerSafetyState.allowsUnsafeServer()) {
screen = new DisconnectedScreen(new JoinMultiplayerScreen(new TitleScreen()),
CommonComponents.CONNECT_FAILED, dsc.getReason());
client.setScreen(screen);
screenOverride = false;
return;
- } else if (KEY_DISCONNECT_REASONS.contains(contents.getKey())) {
+ } else if ((STRING_DISCONNECT_REASONS.contains((disconnectReason.getString())) || KEY_DISCONNECT_REASONS.contains(((TranslatableContents)disconnectReason.getContents()).getKey()))) {
if (ServerSafetyState.getLastServerAddress() != null) {
if (!NCRConfig.getServerWhitelist().isWhitelisted(ServerSafetyState.getLastServerAddress()) && !NCRConfig.getClient().whitelistAllServers()) {
client.setScreen(new UnsafeServerScreen());