PlayerFlagHandler: clean secondary cache less often

DenizenScript · Feb 25, 2021 · cdf9c9d · cdf9c9d
1 parent 1881396
commit cdf9c9d
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/flags/PlayerFlagHandler.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/flags/PlayerFlagHandler.java
@@ -4,15 +4,13 @@
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizencore.flags.AbstractFlagTracker;
 import com.denizenscript.denizencore.flags.SavableMapFlagTracker;
-import com.denizenscript.denizencore.scripts.ScriptHelper;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.lang.ref.SoftReference;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -57,19 +55,28 @@ public boolean shouldExpire() {
 
     private static ArrayList<UUID> toClearCache = new ArrayList<>();
 
-    public static void cleanCache() {
-        if (cacheTimeoutSeconds == -1) {
-            return;
-        }
+    public static void cleanSecondaryCache() {
         toClearCache.clear();
         for (Map.Entry<UUID, SoftReference<CachedPlayerFlag>> entry : secondaryPlayerFlagTrackerCache.entrySet()) {
+            // NOTE: This call will make the GC think the value is still needed, thus the 10 minute cleanup timer to allow the GC to know these are unimportant
             if (entry.getValue().get() == null) {
                 toClearCache.add(entry.getKey());
             }
         }
         for (UUID id : toClearCache) {
             secondaryPlayerFlagTrackerCache.remove(id);
         }
+    }
+
+    private static int secondaryCleanTicker = 0;
+
+    public static void cleanCache() {
+        if (cacheTimeoutSeconds == -1) {
+            return;
+        }
+        if (secondaryCleanTicker++ > 10) {
+            cleanSecondaryCache();
+        }
         long timeNow = System.currentTimeMillis();
         for (Map.Entry<UUID, CachedPlayerFlag> entry : playerFlagTrackerCache.entrySet()) {
             if (cacheTimeoutSeconds > 0 && entry.getValue().lastAccessed + (cacheTimeoutSeconds * 1000) < timeNow) {