Improvement

GuardProducts · Aug 13, 2022 · 0f45840 · 0f45840
1 parent 1556507
commit 0f45840
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/GuardProxy_Plugin/src/main/java/com/guardproducts/api/data/CacheManager.java b/GuardProxy_Plugin/src/main/java/com/guardproducts/api/data/CacheManager.java
@@ -16,8 +16,8 @@ public boolean isCached(final String address) {
     }
 
     public boolean isDisallowedInCache(final String address) {
-        final Boolean allowed = cachedAddresses.getIfPresent(address);
-        return allowed != null && !allowed;
+        final Boolean disAllowed = cachedAddresses.getIfPresent(address);
+        return disAllowed != null && disAllowed;
     }
 
 

diff --git a/GuardProxy_Plugin/src/main/java/com/guardproducts/bungee/listeners/PreJoinListener.java b/GuardProxy_Plugin/src/main/java/com/guardproducts/bungee/listeners/PreJoinListener.java
@@ -52,9 +52,12 @@ public void onJoin(final PreLoginEvent e) {
         if(whitelistManager.isWhitelisted(ip)) {
             return;
         }
-        if(cacheManager.isCached(ip) && cacheManager.isDisallowedInCache(ip)) {
-            e.setCancelReason(this.kickMessage);
-            e.setCancelled(true);
+        if(cacheManager.isCached(ip)) {
+            if(cacheManager.isDisallowedInCache(ip)) {
+                e.setCancelReason(this.kickMessage);
+                e.setCancelled(true);
+                return;
+            }
             return;
         }
         try {