diff options
| author | Aizistral | 2022-09-14 19:28:31 +0200 |
|---|---|---|
| committer | GitHub | 2022-09-14 19:28:31 +0200 |
| commit | d8c1fc6f3fb0e1c535592d23c069ea41e9d74773 (patch) | |
| tree | d97b13a5f14afb52c694e1ec01891a9df94a6a8d /src/main/java | |
| parent | 4a7036222d006e1cf01f3615bdfbecdabdc0eeaf (diff) | |
| parent | 64c96958d24741d85cc2625019d25022ef5661b3 (diff) | |
Merge pull request #187 from Aizistral-Studios/bungeecord
BungeeCord/Waterfall exception
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index e068559..b534f10 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 final Component CONNECT_FAILED_NCR = Component.translatable("connect.failed"); private static boolean screenOverride = false; @Override @@ -56,25 +62,35 @@ public final class NoChatReportsClient implements ClientModInitializer { if (screen instanceof AccessorDisconnectedScreen dsc) { if (screenOverride) return; + if (screen.getTitle() == CONNECT_FAILED_NCR) + 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()); + CONNECT_FAILED_NCR, dsc.getReason()); client.setScreen(screen); screenOverride = false; return; - } else if (KEY_DISCONNECT_REASONS.contains(contents.getKey())) { + } else if (STRING_DISCONNECT_REASONS.contains(disconnectReason.getString()) + || (disconnectReason.getContents() instanceof TranslatableContents translatable && + KEY_DISCONNECT_REASONS.contains(translatable.getKey()))) { if (ServerSafetyState.getLastServerAddress() != null) { if (!NCRConfig.getServerWhitelist().isWhitelisted(ServerSafetyState.getLastServerAddress()) && !NCRConfig.getClient().whitelistAllServers()) { client.setScreen(new UnsafeServerScreen()); } else { if (ServerSafetyState.getReconnectCount() <= 0) { ServerSafetyState.setAllowsUnsafeServer(true); + screenOverride = false; reconnectLastServer(); + return; } else { ServerSafetyState.setReconnectCount(0); + screenOverride = false; + return; } } } |
