Use caffeine cache kickPermission instead of using google.common.cache

LevelTranic · Aug 27, 2024 · 5752ff3 · 5752ff3
1 parent 92c5723
commit 5752ff3
Show file tree

Hide file tree

Showing 46 changed files with 47 additions and 3 deletions.
diff --git a/patches/server/0026-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch b/patches/server/0026-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch
@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
+Date: Sun, 23 Jun 2024 11:26:20 +0800
+Subject: [PATCH] Leaf: Use caffeine cache kickPermission instead of using 
+ google.common.cache
+
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index ee8f2fce3b6b2ddd6fb7a767a30dcf4d0e4888e7..9a4f53ebee1c7be2b61ddb203a4d36e138886a52 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -333,19 +333,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+     private boolean justTeleported = false;
+     // CraftBukkit end
+
+-        // Purpur start
+-    private final com.google.common.cache.LoadingCache<CraftPlayer, Boolean> kickPermissionCache = com.google.common.cache.CacheBuilder.newBuilder()
++    // Purpur start // Leaf start - Use caffeine cache kickPermission instead of using google.common.cache
++    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(
+-            new com.google.common.cache.CacheLoader<>() {
+-                @Override
+-                public Boolean load(CraftPlayer player) {
+-                    return player.hasPermission("purpur.bypassIdleKick");
+-                }
+-            }
+-        );
+-    // Purpur end
++            .build(player -> player.hasPermission("purpur.bypassIdleKick"));
++    // Purpur end // Leaf - Use caffeine cache kickPermission instead of using google.common.cache
+
+     @Override
+     public void tick() {
+@@ -416,7 +409,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
diff --git a/...server/0026-Leaves-Zero-tick-plants.patch → ...server/0027-Leaves-Zero-tick-plants.patch b/...server/0026-Leaves-Zero-tick-plants.patch → ...server/0027-Leaves-Zero-tick-plants.patch
diff --git a/...hes/server/0027-Leaves-Entity-Utils.patch → ...hes/server/0028-Leaves-Entity-Utils.patch b/...hes/server/0027-Leaves-Entity-Utils.patch → ...hes/server/0028-Leaves-Entity-Utils.patch
diff --git a/...028-Leaves-Return-nether-portal-fix.patch → ...029-Leaves-Return-nether-portal-fix.patch b/...028-Leaves-Return-nether-portal-fix.patch → ...029-Leaves-Return-nether-portal-fix.patch
diff --git a/...s/server/0029-Leaves-Vanilla-hopper.patch → ...s/server/0030-Leaves-Vanilla-hopper.patch b/...s/server/0029-Leaves-Vanilla-hopper.patch → ...s/server/0030-Leaves-Vanilla-hopper.patch
diff --git a/...ves-Raider-die-skip-self-raid-check.patch → ...ves-Raider-die-skip-self-raid-check.patch b/...ves-Raider-die-skip-self-raid-check.patch → ...ves-Raider-die-skip-self-raid-check.patch
diff --git a/...fish-Optimize-entity-coordinate-key.patch → ...fish-Optimize-entity-coordinate-key.patch b/...fish-Optimize-entity-coordinate-key.patch → ...fish-Optimize-entity-coordinate-key.patch
@@ -27,7 +27,7 @@ index 0e1dedb9baf70bd788a665e3cd7e53aa5f55def3..6c57a4bb3e30f906fddf84957533868a
 
      public static long getCoordinateKey(final ChunkPos pair) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 24c4140e44b021728e39310f4e8bb93ada4adc0f..1390bc0f51ea2c957e470135eba1564f02840de9 100644
+index 54065a663adeec4f8d429a14dd1e4f5fd47a6f48..e1b63e185f054b35b1ba522407541b21247e2e1f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -315,7 +315,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...ve-container-checking-with-a-bitset.patch → ...ve-container-checking-with-a-bitset.patch b/...ve-container-checking-with-a-bitset.patch → ...ve-container-checking-with-a-bitset.patch
diff --git a/...btimizations-RePathing-optimization.patch → ...btimizations-RePathing-optimization.patch b/...btimizations-RePathing-optimization.patch → ...btimizations-RePathing-optimization.patch
diff --git a/...timization-Zombie-Search-And-Destro.patch → ...timization-Zombie-Search-And-Destro.patch b/...timization-Zombie-Search-And-Destro.patch → ...timization-Zombie-Search-And-Destro.patch
diff --git a/...r/0035-Divine-Implement-Secure-Seed.patch → ...r/0036-Divine-Implement-Secure-Seed.patch b/...r/0035-Divine-Implement-Secure-Seed.patch → ...r/0036-Divine-Implement-Secure-Seed.patch
diff --git a/...hes/server/0036-Divine-Fix-MC-31819.patch → ...hes/server/0037-Divine-Fix-MC-31819.patch b/...hes/server/0036-Divine-Fix-MC-31819.patch → ...hes/server/0037-Divine-Fix-MC-31819.patch
diff --git a/...es/server/0037-Divine-Fix-MC-172801.patch → ...es/server/0038-Divine-Fix-MC-172801.patch b/...es/server/0037-Divine-Fix-MC-172801.patch → ...es/server/0038-Divine-Fix-MC-172801.patch
diff --git a/patches/server/0038-Divine-Fix-MC-2025.patch → patches/server/0039-Divine-Fix-MC-2025.patch b/patches/server/0038-Divine-Fix-MC-2025.patch → patches/server/0039-Divine-Fix-MC-2025.patch
diff --git a/...rver/0039-Divine-C2ME-reduce_allocs.patch → ...rver/0040-Divine-C2ME-reduce_allocs.patch b/...rver/0039-Divine-C2ME-reduce_allocs.patch → ...rver/0040-Divine-C2ME-reduce_allocs.patch
diff --git a/...s/server/0040-Divine-C2ME-opts-math.patch → ...s/server/0041-Divine-C2ME-opts-math.patch b/...s/server/0040-Divine-C2ME-opts-math.patch → ...s/server/0041-Divine-C2ME-opts-math.patch
diff --git a/patches/server/0041-Divine-Fix-MC-7569.patch → patches/server/0042-Divine-Fix-MC-7569.patch b/patches/server/0041-Divine-Fix-MC-7569.patch → patches/server/0042-Divine-Fix-MC-7569.patch
diff --git a/...r/0042-Divine-lithium-math.sine_lut.patch → ...r/0043-Divine-lithium-math.sine_lut.patch b/...r/0042-Divine-lithium-math.sine_lut.patch → ...r/0043-Divine-lithium-math.sine_lut.patch
diff --git a/...0043-Divine-lithium-cached_hashcode.patch → ...0044-Divine-lithium-cached_hashcode.patch b/...0043-Divine-lithium-cached_hashcode.patch → ...0044-Divine-lithium-cached_hashcode.patch
diff --git a/...hes/server/0044-Divine-Fix-MC-93826.patch → ...hes/server/0045-Divine-Fix-MC-93826.patch b/...hes/server/0044-Divine-Fix-MC-93826.patch → ...hes/server/0045-Divine-Fix-MC-93826.patch
diff --git a/...es/server/0045-Divine-Fix-MC-110386.patch → ...es/server/0046-Divine-Fix-MC-110386.patch b/...es/server/0045-Divine-Fix-MC-110386.patch → ...es/server/0046-Divine-Fix-MC-110386.patch
diff --git a/...6-Divine-Fix-MC-98160-and-MC-105103.patch → ...7-Divine-Fix-MC-98160-and-MC-105103.patch b/...6-Divine-Fix-MC-98160-and-MC-105103.patch → ...7-Divine-Fix-MC-98160-and-MC-105103.patch
diff --git a/...hes/server/0047-Divine-Fix-MC-93018.patch → ...hes/server/0048-Divine-Fix-MC-93018.patch b/...hes/server/0047-Divine-Fix-MC-93018.patch → ...hes/server/0048-Divine-Fix-MC-93018.patch
diff --git a/...hes/server/0048-Divine-Fix-MC-65198.patch → ...hes/server/0049-Divine-Fix-MC-65198.patch b/...hes/server/0048-Divine-Fix-MC-65198.patch → ...hes/server/0049-Divine-Fix-MC-65198.patch
diff --git a/...es/server/0049-Divine-Fix-MC-167242.patch → ...es/server/0050-Divine-Fix-MC-167242.patch b/...es/server/0049-Divine-Fix-MC-167242.patch → ...es/server/0050-Divine-Fix-MC-167242.patch
diff --git a/...-Dont-load-chunks-to-spawn-phantoms.patch → ...-Dont-load-chunks-to-spawn-phantoms.patch b/...-Dont-load-chunks-to-spawn-phantoms.patch → ...-Dont-load-chunks-to-spawn-phantoms.patch
diff --git a/...1-CarpetFix-incorrectBounceLogicFix.patch → ...2-CarpetFix-incorrectBounceLogicFix.patch b/...1-CarpetFix-incorrectBounceLogicFix.patch → ...2-CarpetFix-incorrectBounceLogicFix.patch
diff --git a/...-explosionBreaksItemFrameInWaterFix.patch → ...-explosionBreaksItemFrameInWaterFix.patch b/...-explosionBreaksItemFrameInWaterFix.patch → ...-explosionBreaksItemFrameInWaterFix.patch
diff --git a/...on-Random-flatten-triangular-distri.patch → ...on-Random-flatten-triangular-distri.patch b/...on-Random-flatten-triangular-distri.patch → ...on-Random-flatten-triangular-distri.patch
diff --git a/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch b/...-distanceToSqr-call-in-ServerEntity.patch → ...-distanceToSqr-call-in-ServerEntity.patch
diff --git a/...-dirty-stats-copy-when-requesting-p.patch → ...-dirty-stats-copy-when-requesting-p.patch b/...-dirty-stats-copy-when-requesting-p.patch → ...-dirty-stats-copy-when-requesting-p.patch
diff --git a/...-ScalableLux-Upstream-Starlight-Fix.patch → ...-ScalableLux-Upstream-Starlight-Fix.patch b/...-ScalableLux-Upstream-Starlight-Fix.patch → ...-ScalableLux-Upstream-Starlight-Fix.patch
diff --git a/...57-Gale-Use-platform-math-functions.patch → ...58-Gale-Use-platform-math-functions.patch b/...57-Gale-Use-platform-math-functions.patch → ...58-Gale-Use-platform-math-functions.patch
diff --git a/...ster-floating-point-positive-modulo.patch → ...ster-floating-point-positive-modulo.patch b/...ster-floating-point-positive-modulo.patch → ...ster-floating-point-positive-modulo.patch
diff --git a/...0059-Gale-Specific-interval-TPS-API.patch → ...0060-Gale-Specific-interval-TPS-API.patch b/...0059-Gale-Specific-interval-TPS-API.patch → ...0060-Gale-Specific-interval-TPS-API.patch
diff --git a/...lock-destruction-packet-allocations.patch → ...lock-destruction-packet-allocations.patch b/...lock-destruction-packet-allocations.patch → ...lock-destruction-packet-allocations.patch
diff --git a/...-Gale-Optimize-matching-item-checks.patch → ...-Gale-Optimize-matching-item-checks.patch b/...-Gale-Optimize-matching-item-checks.patch → ...-Gale-Optimize-matching-item-checks.patch
diff --git a/...2-Gale-Store-mob-counts-in-an-array.patch → ...3-Gale-Store-mob-counts-in-an-array.patch b/...2-Gale-Store-mob-counts-in-an-array.patch → ...3-Gale-Store-mob-counts-in-an-array.patch
diff --git a/...n-check-has-physics-before-same-veh.patch → ...n-check-has-physics-before-same-veh.patch b/...n-check-has-physics-before-same-veh.patch → ...n-check-has-physics-before-same-veh.patch
@@ -16,7 +16,7 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 34fbfdd87e7a7ddcaa22813a55142a559235af51..a806b1ca018091ceef1aa22a03a54d6de45efcd8 100644
+index ca9d63cd2212191ff41b1161f683876c90f701d9..a14906340a6278ee2740b6f0d1a160f8555ba13a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2229,8 +2229,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...-Optimize-Math.round-and-Math.hypot.patch → ...-Optimize-Math.round-and-Math.hypot.patch b/...-Optimize-Math.round-and-Math.hypot.patch → ...-Optimize-Math.round-and-Math.hypot.patch
diff --git a/...hes/server/0065-MemoryLeakFix-Biome.patch → ...hes/server/0066-MemoryLeakFix-Biome.patch b/...hes/server/0065-MemoryLeakFix-Biome.patch → ...hes/server/0066-MemoryLeakFix-Biome.patch
diff --git a/...lock-type-in-SculkSensorBlock-canAc.patch → ...lock-type-in-SculkSensorBlock-canAc.patch b/...lock-type-in-SculkSensorBlock-canAc.patch → ...lock-type-in-SculkSensorBlock-canAc.patch
diff --git a/...067-lithium-precompute-shape-arrays.patch → ...068-lithium-precompute-shape-arrays.patch b/...067-lithium-precompute-shape-arrays.patch → ...068-lithium-precompute-shape-arrays.patch
diff --git a/.../server/0068-vmp-TypeFilterableList.patch → .../server/0069-vmp-TypeFilterableList.patch b/.../server/0068-vmp-TypeFilterableList.patch → .../server/0069-vmp-TypeFilterableList.patch
diff --git a/...lice-Improve-map-saving-performance.patch → ...lice-Improve-map-saving-performance.patch b/...lice-Improve-map-saving-performance.patch → ...lice-Improve-map-saving-performance.patch
diff --git a/...Slice-noEntityCollisions-for-Entity.patch → ...Slice-noEntityCollisions-for-Entity.patch b/...Slice-noEntityCollisions-for-Entity.patch → ...Slice-noEntityCollisions-for-Entity.patch
@@ -18,7 +18,7 @@ index ee8e9c0e3690e78f3cc621ddfca89ea4256d4803..0466b04f24830539f2c927481c1c7995
          }
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5d34f5a52219474d8ef91a9f030dde4f0c3aa8e5..95ca447e102e505d37a61f5c98f625bc1490a3fb 100644
+index a14906340a6278ee2740b6f0d1a160f8555ba13a..dbbb5db2764098d677ad730652ff43ce9e4e3ca4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -542,6 +542,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess