summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorAizistral2022-09-14 19:19:52 +0200
committerAizistral2022-09-14 19:19:52 +0200
commit83becfd7679e0220736a9b2b4481dd3b0d4be89d (patch)
treeb278d517fa581c3672789b7bade7df958b323028 /src/main
parenta30842db3b6a0c8ff61636023d0942831bef0efa (diff)
Additional failsafe against screen loops
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
index df16a66..1b1412e 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
@@ -46,6 +46,7 @@ public final class NoChatReportsClient implements ClientModInitializer {
"Secure profile expired.",
"Secure profile invalid."
);
+ private static final Component CONNECT_FAILED_NCR = Component.translatable("connect.failed");
private static boolean screenOverride = false;
@Override
@@ -61,6 +62,8 @@ public final class NoChatReportsClient implements ClientModInitializer {
if (screen instanceof AccessorDisconnectedScreen dsc) {
if (screenOverride)
return;
+ if (screen.getTitle() == CONNECT_FAILED_NCR)
+ return;
screenOverride = true;
var disconnectReason = dsc.getReason();
@@ -68,7 +71,7 @@ public final class NoChatReportsClient implements ClientModInitializer {
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;