summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAizistral2022-10-24 13:11:55 +0200
committerAizistral2022-10-24 13:11:55 +0200
commit2a7a6be422b0ddb33bd9e2138cb563514aab605b (patch)
tree68cd77b3d45a2e57d3dbe8579379a09880b6c614 /src
parent8ca9945f80393a3e4fb05a9a66c6246e4b730e54 (diff)
Improve server whitelist check
Fixes #228
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRServerWhitelist.java3
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());
}
}