Fix wrong cache method

Winds-Studio · Jun 23, 2024 · d7d6eed · d7d6eed
1 parent cca79a7
commit d7d6eed
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/patches/server/0077-Use-caffeine-cache-kickPermission-instead-of-using-g.patch b/patches/server/0077-Use-caffeine-cache-kickPermission-instead-of-using-g.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use caffeine cache kickPermission instead of using
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1dcf131335fbeb19f6e01dee921587075df1231c..8b0578423b7107fb9152cc258fd082cf13aa9ab9 100644
+index 1dcf131335fbeb19f6e01dee921587075df1231c..b362ebbf164c46764c7b918b24cbe1721afc078f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -338,17 +338,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -15,7 +15,7 @@ index 1dcf131335fbeb19f6e01dee921587075df1231c..8b0578423b7107fb9152cc258fd082cf
      // Purpur start
 -    private final com.google.common.cache.LoadingCache<CraftPlayer, Boolean> kickPermissionCache = com.google.common.cache.CacheBuilder.newBuilder()
 +    // Leaf start - Use caffeine cache kickPermission instead of using google.common.cache
-+    private final com.github.benmanes.caffeine.cache.Cache<CraftPlayer, Boolean> kickPermissionCache = com.github.benmanes.caffeine.cache.Caffeine.newBuilder()
++    private final com.github.benmanes.caffeine.cache.LoadingCache<CraftPlayer, Boolean> kickPermissionCache = com.github.benmanes.caffeine.cache.Caffeine.newBuilder()
              .maximumSize(1000)
              .expireAfterWrite(1, java.util.concurrent.TimeUnit.MINUTES)
 -            .build(
@@ -31,3 +31,12 @@ index 1dcf131335fbeb19f6e01dee921587075df1231c..8b0578423b7107fb9152cc258fd082cf
      // Purpur end
 
      @Override
+@@ -420,7 +415,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+         if (this.player.getLastActionTime() > 0L && this.server.getPlayerIdleTimeout() > 0 && Util.getMillis() - this.player.getLastActionTime() > (long) this.server.getPlayerIdleTimeout() * 1000L * 60L && !this.player.wonGame) { // Paper - Prevent AFK kick while watching end credits
+             // Purpur start
+             this.player.setAfk(true);
+-            if (!this.player.level().purpurConfig.idleTimeoutKick || (!Boolean.parseBoolean(System.getenv("PURPUR_FORCE_IDLE_KICK")) && kickPermissionCache.getUnchecked(this.player.getBukkitEntity()))) {
++            if (!this.player.level().purpurConfig.idleTimeoutKick || (!Boolean.parseBoolean(System.getenv("PURPUR_FORCE_IDLE_KICK")) && kickPermissionCache.get(this.player.getBukkitEntity()))) { // Leaf - Use caffeine cache kickPermission instead of using google.common.cache
+                 return;
+             }
+             // Purpur end