summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorAizistral2022-10-05 22:29:18 +0200
committerAizistral2022-10-05 22:29:18 +0200
commitb0df62e7ddfecbbcbd2685245764502b1eeee92f (patch)
tree162d948754d3763d6f8a133fba00d5e078fe15cd /src/main/java
parentc52766dc64e8fbef15ee1ee174972c76ac44cbfc (diff)
Don't parse disconnect messages where we need not
Closes #199
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java5
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java12
2 files changed, 13 insertions, 4 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
index 53ee07e..ea1bdb4 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
@@ -71,9 +71,7 @@ public final class NoChatReportsClient implements ClientModInitializer {
return;
if (screen instanceof AccessorDisconnectedScreen dsc) {
- if (screenOverride)
- return;
- if (screen.getTitle() == CONNECT_FAILED_NCR)
+ if (screenOverride || ServerSafetyState.isOnServer() || screen.getTitle() == CONNECT_FAILED_NCR)
return;
screenOverride = true;
@@ -145,6 +143,7 @@ public final class NoChatReportsClient implements ClientModInitializer {
client.execute(() -> {
ServerSafetyState.setReconnectCount(0);
+ ServerSafetyState.setOnServer(true);
if (!client.isLocalServer()) {
boolean canSend = ClientPlayNetworking.canSend(NoChatReports.CHANNEL);
diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
index 50c3661..0d5b591 100644
--- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
+++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java
@@ -24,7 +24,8 @@ public final class ServerSafetyState {
private static ServerSafetyLevel current = ServerSafetyLevel.UNKNOWN;
private static ServerAddress lastServerAddress = null;
private static ServerData lastServerData = null;
- private static AtomicBoolean allowUnsafeServer = new AtomicBoolean(false), sessionRequestedKey = new AtomicBoolean(false);
+ private static AtomicBoolean allowUnsafeServer = new AtomicBoolean(false),
+ sessionRequestedKey = new AtomicBoolean(false), isOnServer = new AtomicBoolean(false);
private static AtomicInteger reconnectCount = new AtomicInteger(0);
private static AtomicLong disconnectMillis = new AtomicLong(0);
@@ -92,10 +93,19 @@ public final class ServerSafetyState {
disconnectMillis.set(millis);
}
+ public static boolean isOnServer() {
+ return isOnServer.get();
+ }
+
+ public static void setOnServer(boolean on) {
+ isOnServer.set(on);
+ }
+
public static void reset() {
current = ServerSafetyLevel.UNKNOWN;
allowUnsafeServer.set(false);
sessionRequestedKey.set(false);
+ isOnServer.set(false);
if (NCRConfig.getCommon().enableDebugLog()) {
NoChatReports.LOGGER.info("allowUnsafeServer: {}", allowUnsafeServer.get());