misc: use caffeine in sent cache

4drian3d · Mar 7, 2023 · 200f7c9 · 200f7c9
1 parent 65c8f09
commit 200f7c9
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/src/main/java/io/github/_4drian3d/kickredirect/listener/KickListener.java b/src/main/java/io/github/_4drian3d/kickredirect/listener/KickListener.java
@@ -1,12 +1,12 @@
 package io.github._4drian3d.kickredirect.listener;
 
 import java.time.Duration;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
 
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import com.velocitypowered.api.event.Continuation;
 import com.velocitypowered.api.event.PostOrder;
 import com.velocitypowered.api.event.Subscribe;
@@ -26,7 +26,9 @@
 
 public final class KickListener {
     private final KickRedirect plugin;
-    private final Map<UUID, String> sent = new HashMap<>();
+    private final Cache<UUID, String> sent = Caffeine.newBuilder()
+            .expireAfterWrite(Duration.ofMillis(10))
+            .build();
 
     public KickListener(final KickRedirect plugin) {
         this.plugin = plugin;
@@ -67,7 +69,6 @@ public void onKickFromServer(final KickedFromServerEvent event, final Continuati
             continuation.resume();
             cache(event, null, KickStep.DISALLOWED_REASON);
         }
-
     }
 
     void cache(KickedFromServerEvent event, String serverName, KickStep step) {
@@ -83,16 +84,18 @@ boolean reasonCheck(KickedFromServerEvent event) {
         final Optional<String> optional = event.getServerKickReason()
                 .map(PlainTextComponentSerializer.plainText()::serialize);
 
+        final var configuration = plugin.config().get();
+
         if (optional.isPresent()) {
             final String message = optional.get();
             for (final String msg : plugin.config().get().getMessagesToCheck()) {
                 if (Strings.containsIgnoreCase(message, msg)) {
-                    return plugin.config().get().checkMode() == CheckMode.WHITELIST;
+                    return configuration.checkMode() == CheckMode.WHITELIST;
                 }
             }
-            return plugin.config().get().checkMode() != CheckMode.WHITELIST;
+            return configuration.checkMode() != CheckMode.WHITELIST;
         } else {
-            return plugin.config().get().redirectOnNullMessage();
+            return configuration.redirectOnNullMessage();
         }
     }
 
@@ -119,13 +122,9 @@ void applyKickResult(KickedFromServerEvent event) {
 
     void addToSent(Player player, RegisteredServer server) {
         sent.put(player.getUniqueId(), server.getServerInfo().getName());
-        plugin.getProxy().getScheduler()
-                .buildTask(plugin, () -> sent.remove(player.getUniqueId()))
-                .delay(Duration.ofMillis(10))
-                .schedule();
     }
 
     boolean shouldKick(Player player, RegisteredServer server) {
-        return Objects.equals(sent.get(player.getUniqueId()), server.getServerInfo().getName());
+        return Objects.equals(sent.getIfPresent(player.getUniqueId()), server.getServerInfo().getName());
     }
 }