From 2a7a6be422b0ddb33bd9e2138cb563514aab605b Mon Sep 17 00:00:00 2001 From: Aizistral Date: Mon, 24 Oct 2022 13:11:55 +0200 Subject: Improve server whitelist check Fixes #228 --- src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java | 2 +- .../java/com/aizistral/nochatreports/config/NCRServerWhitelist.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index 35e7d66..b94e2f2 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -96,7 +96,7 @@ public final class NoChatReportsClient implements ClientModInitializer { || (disconnectReason.getContents() instanceof TranslatableContents translatable && KEY_DISCONNECT_REASONS.contains(translatable.getKey()))) { if (ServerSafetyState.getLastServerAddress() != null) { - if (!NCRConfig.getServerWhitelist().isWhitelisted(ServerSafetyState.getLastServerAddress()) && !NCRConfig.getClient().whitelistAllServers()) { + if (!NCRConfig.getServerWhitelist().isWhitelisted(ServerSafetyState.getLastServerAddress())) { if (NCRConfig.getCommon().enableDebugLog()) { NoChatReports.LOGGER.info("Server {} evaluated as unsafe and is not whitelisted, displaying warning screen.", ServerSafetyState.getLastServerAddress().getHost() + ":" + ServerSafetyState.getLastServerAddress().getPort()); diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java b/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java index 48658e7..5d36cf5 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java @@ -42,7 +42,8 @@ public class NCRServerWhitelist extends JSONConfig { */ public boolean isWhitelisted(ServerAddress address) { - return this.getList().contains(address.getHost() + ":" + address.getPort()); + return NCRConfig.getClient().whitelistAllServers() || + this.getList().contains(address.getHost() + ":" + address.getPort()); } } -- cgit v1.2.3