mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-21 16:09:19 +00:00
387edb77c1
Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@be61a07 Updated Upstream (Paper) PurpurMC/Purpur@f154903 Updated Upstream (Paper) PurpurMC/Purpur@0fa9a50 Updated Upstream (Paper) PurpurMC/Purpur@d7a7c91 Updated Upstream (Paper) PurpurMC/Purpur@20fa61e Updated Upstream (Paper) PurpurMC/Purpur@501e7c5 Updated Upstream (Paper) PurpurMC/Purpur@2a50638 Updated Upstream (Paper) PurpurMC/Purpur@639bcbd Updated Upstream (Paper) PurpurMC/Purpur@bcf8103 remove obsolete allowUnsafeEnchants config option PurpurMC/Purpur@51f15ee fully remove obsolete allowUnsafeEnchants config option PurpurMC/Purpur@3d0716d Fix colored shulker box contents not dropping when destroyed, supercedes #1594 PurpurMC/Purpur@12e2926 [ci skip] drop old migration patch PurpurMC/Purpur@212c942 delegate itemstack convenience methods PurpurMC/Purpur@2eaea6a switch to JSpecify annotations
43 lines
2.9 KiB
Diff
43 lines
2.9 KiB
Diff
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] 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 31c3b9e281708784631230d80c4777f1486f26d5..98133a57f3f1b28dbc40de45ca755eff13463c7f 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -339,17 +339,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
|
// CraftBukkit end
|
|
|
|
// 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.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");
|
|
- }
|
|
- }
|
|
- );
|
|
+ .build(player -> player.hasPermission("purpur.bypassIdleKick"));
|
|
+ // Leaf - Use caffeine cache kickPermission instead of using google.common.cache
|
|
// Purpur end
|
|
|
|
public final org.leavesmc.leaves.protocol.syncmatica.exchange.ExchangeTarget exchangeTarget; // Leaves - Syncmatica Protocol
|
|
@@ -423,7 +418,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
|