include pufferfish patches

2026-02-17 16:37:43 +01:00 · 2023-03-22 05:27:54 -07:00
parent 9cda2e740b
commit a0077699e6
362 changed files with 4983 additions and 751 deletions
--- a/patches/server/0010-AFK-API.patch
+++ b/patches/server/0010-AFK-API.patch
@@ -1,323 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Thu, 8 Aug 2019 15:29:15 -0500
-Subject: [PATCH] AFK API
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8fa36563e130f8af0fc60d84d08134fa54c4ca53..dae286863e7bf9316b23724f14d0f22f522cad4a 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2058,8 +2058,63 @@ public class ServerPlayer extends Player {
- 
-     public void resetLastActionTime() {
-         this.lastActionTime = Util.getMillis();
-+        this.setAfk(false); // Purpur
-     }
- 
-+    // Purpur Start
-+    private boolean isAfk = false;
-+
-+    @Override
-+    public void setAfk(boolean afk) {
-+        if (this.isAfk == afk) {
-+            return;
-+        }
-+
-+        String msg = afk ? org.purpurmc.purpur.PurpurConfig.afkBroadcastAway : org.purpurmc.purpur.PurpurConfig.afkBroadcastBack;
-+
-+        org.purpurmc.purpur.event.PlayerAFKEvent event = new org.purpurmc.purpur.event.PlayerAFKEvent(this.getBukkitEntity(), afk, this.level.purpurConfig.idleTimeoutKick, msg, !Bukkit.isPrimaryThread());
-+        if (!event.callEvent() || event.shouldKick()) {
-+            return;
-+        }
-+
-+        this.isAfk = afk;
-+
-+        if (!afk) {
-+            resetLastActionTime();
-+        }
-+
-+        msg = event.getBroadcastMsg();
-+        if (msg != null && !msg.isEmpty()) {
-+            server.getPlayerList().broadcastMiniMessage(String.format(msg, this.getGameProfile().getName()), false);
-+        }
-+
-+        if (this.level.purpurConfig.idleTimeoutUpdateTabList) {
-+            String scoreboardName = getScoreboardName();
-+            String playerListName = getBukkitEntity().getPlayerListName();
-+            String[] split = playerListName.split(scoreboardName);
-+            String prefix = (split.length > 0 ? split[0] : "").replace(org.purpurmc.purpur.PurpurConfig.afkTabListPrefix, "");
-+            String suffix = (split.length > 1 ? split[1] : "").replace(org.purpurmc.purpur.PurpurConfig.afkTabListSuffix, "");
-+            if (afk) {
-+                getBukkitEntity().setPlayerListName(org.purpurmc.purpur.PurpurConfig.afkTabListPrefix + prefix + scoreboardName + suffix + org.purpurmc.purpur.PurpurConfig.afkTabListSuffix, true);
-+            } else {
-+                getBukkitEntity().setPlayerListName(prefix + scoreboardName + suffix);
-+            }
-+        }
-+
-+        ((ServerLevel) this.level).updateSleepingPlayerList();
-+    }
-+
-+    @Override
-+    public boolean isAfk() {
-+        return this.isAfk;
-+    }
-+
-+    @Override
-+    public boolean canBeCollidedWith() {
-+        return !this.isAfk() && super.canBeCollidedWith();
-+    }
-+    // Purpur End
-+
-     public ServerStatsCounter getStats() {
-         return this.stats;
-     }
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4037ab672c5dfe417307b2c40474b3c48ae529f0..1e3aa42d2e293f465d91964d2a5aa9118fc4c57b 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -337,6 +337,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-     private boolean justTeleported = false;
-     private boolean hasMoved; // Spigot
- 
-+    // Purpur start
-+    private final com.google.common.cache.LoadingCache<CraftPlayer, Boolean> kickPermissionCache = com.google.common.cache.CacheBuilder.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
-+
-     public CraftPlayer getCraftPlayer() {
-         return (this.player == null) ? null : (CraftPlayer) this.player.getBukkitEntity();
-     }
-@@ -430,6 +444,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-         }
- 
-         if (this.player.getLastActionTime() > 0L && this.server.getPlayerIdleTimeout() > 0 && Util.getMillis() - this.player.getLastActionTime() > (long) (this.server.getPlayerIdleTimeout() * 1000 * 60) && !this.player.wonGame) { // Paper - Prevent AFK kick while watching end credits.
-+            // Purpur start
-+            this.player.setAfk(true);
-+            if (!this.player.level.purpurConfig.idleTimeoutKick || kickPermissionCache.getUnchecked(this.player.getBukkitEntity())) {
-+                return;
-+            }
-+            // Purpur end
-             this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854
-             this.disconnect(Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause
-         }
-@@ -734,6 +754,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-                     this.lastYaw = to.getYaw();
-                     this.lastPitch = to.getPitch();
- 
-+                    if (!to.getWorld().getUID().equals(from.getWorld().getUID()) || to.getBlockX() != from.getBlockX() || to.getBlockY() != from.getBlockY() || to.getBlockZ() != from.getBlockZ() || to.getYaw() != from.getYaw() || to.getPitch() != from.getPitch()) this.player.resetLastActionTime(); // Purpur
-+
-                     // Skip the first time we do this
-                     if (true) { // Spigot - don't skip any move events
-                         Location oldTo = to.clone();
-@@ -1537,7 +1559,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
- 
-                             if (!this.player.isChangingDimension() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.gameMode.isCreative() && this.player.gameMode.getGameModeForPlayer() != GameType.SPECTATOR) { // Spigot
-                                 flag2 = true; // Paper - diff on change, this should be moved wrongly
-                                ServerGamePacketListenerImpl.LOGGER.warn("{} moved wrongly!", this.player.getName().getString());
-+                                ServerGamePacketListenerImpl.LOGGER.warn("{} moved wrongly!, ({})", this.player.getName().getString(), d11); // Purpur
-                             }
- 
-                             this.player.absMoveTo(d0, d1, d2, f, f1);
-@@ -1588,6 +1610,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-                                     this.lastYaw = to.getYaw();
-                                     this.lastPitch = to.getPitch();
- 
-+                                    if (!to.getWorld().getUID().equals(from.getWorld().getUID()) || to.getBlockX() != from.getBlockX() || to.getBlockY() != from.getBlockY() || to.getBlockZ() != from.getBlockZ() || to.getYaw() != from.getYaw() || to.getPitch() != from.getPitch()) this.player.resetLastActionTime(); // Purpur
-+
-                                     // Skip the first time we do this
-                                     if (from.getX() != Double.MAX_VALUE) {
-                                         Location oldTo = to.clone();
-diff --git a/src/main/java/net/minecraft/server/players/SleepStatus.java b/src/main/java/net/minecraft/server/players/SleepStatus.java
-index 823efad652d8ff9e96b99375b102fef6f017716e..60f89d7c77a5e792e21e93e35ed1670bd565799a 100644
--- a/src/main/java/net/minecraft/server/players/SleepStatus.java
-+++ b/src/main/java/net/minecraft/server/players/SleepStatus.java
-@@ -19,7 +19,7 @@ public class SleepStatus {
- 
-     public boolean areEnoughDeepSleeping(int percentage, List<ServerPlayer> players) {
-         // CraftBukkit start
-        int j = (int) players.stream().filter((eh) -> { return eh.isSleepingLongEnough() || eh.fauxSleeping; }).count();
-+        int j = (int) players.stream().filter((eh) -> { return eh.isSleepingLongEnough() || eh.fauxSleeping || (eh.level.purpurConfig.idleTimeoutCountAsSleeping && eh.isAfk()); }).count(); // Purpur
-         boolean anyDeepSleep = players.stream().anyMatch(Player::isSleepingLongEnough);
- 
-         return anyDeepSleep && j >= this.sleepersNeeded(percentage);
-@@ -52,7 +52,7 @@ public class SleepStatus {
- 
-             if (!entityplayer.isSpectator()) {
-                 ++this.activePlayers;
-                if (entityplayer.isSleeping() || entityplayer.fauxSleeping) { // CraftBukkit
-+                if ((entityplayer.isSleeping() || entityplayer.fauxSleeping) || (entityplayer.level.purpurConfig.idleTimeoutCountAsSleeping && entityplayer.isAfk())) { // CraftBukkit // Purpur
-                     ++this.sleepingPlayers;
-                 }
-                 // CraftBukkit start
-diff --git a/src/main/java/net/minecraft/world/entity/EntitySelector.java b/src/main/java/net/minecraft/world/entity/EntitySelector.java
-index 72abebff2018cde2922e97ad6478f93da9aed3ec..412963d7af38a53b6010007278d959a5b11b83c3 100644
--- a/src/main/java/net/minecraft/world/entity/EntitySelector.java
-+++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java
-@@ -39,6 +39,7 @@ public final class EntitySelector {
-         return net.minecraft.util.Mth.clamp(serverPlayer.getStats().getValue(net.minecraft.stats.Stats.CUSTOM.get(net.minecraft.stats.Stats.TIME_SINCE_REST)), 1, Integer.MAX_VALUE) >= playerInsomniaTicks;
-     };
-     // Paper end
-+    public static Predicate<Player> notAfk = (player) -> !player.isAfk(); // Purpur
- 
-     private EntitySelector() {}
-     // Paper start
-diff --git a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
-index a7575b5ef56af6f53448d391abb4956e130148ca..0a9e4dc5d6d567605c587df9bcbb57d379b62877 100644
--- a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
-@@ -64,6 +64,10 @@ public class TargetingConditions {
-             return false;
-         } else if (this.selector != null && !this.selector.test(targetEntity)) {
-             return false;
-+        // Purpur start
-+        } else if (!targetEntity.level.purpurConfig.idleTimeoutTargetPlayer && targetEntity instanceof net.minecraft.server.level.ServerPlayer player && player.isAfk()) {
-+            return false;
-+        // Purpur end
-         } else {
-             if (baseEntity == null) {
-                 if (this.isCombat && (!targetEntity.canBeSeenAsEnemy() || targetEntity.level.getDifficulty() == Difficulty.PEACEFUL)) {
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 65cdd155dc71cf0866a28714dc2c6a92886f2755..21da282c50a31d0d9a59bc93e6c60afe37950900 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -201,6 +201,13 @@ public abstract class Player extends LivingEntity {
-     // Purpur start
-     public abstract void resetLastActionTime();
- 
-+    public void setAfk(boolean afk) {
-+    }
-+
-+    public boolean isAfk() {
-+        return false;
-+    }
-+
-     @Override
-     public boolean processClick(InteractionHand hand) {
-         Entity vehicle = getRootVehicle();
-diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index 3b959f42d958bf0f426853aee56753d6c455fcdb..d17abb283ea818244df0379d6b57fc634071e0b9 100644
--- a/src/main/java/net/minecraft/world/level/EntityGetter.java
-+++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
-@@ -154,7 +154,7 @@ public interface EntityGetter {
- 
-     default boolean hasNearbyAlivePlayer(double x, double y, double z, double range) {
-         for(Player player : this.players()) {
-            if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player)) {
-+            if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player) && EntitySelector.notAfk.test(player)) {
-                 double d = player.distanceToSqr(x, y, z);
-                 if (range < 0.0D || d < range * range) {
-                     return true;
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6c502a804344d2121653d330a689d012cf5c4562..840849cebbf9090c21923d30e0e3afbc7f14ac43 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -525,10 +525,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
- 
-     @Override
-     public void setPlayerListName(String name) {
-+        // Purpur start
-+        setPlayerListName(name, false);
-+    }
-+    public void setPlayerListName(String name, boolean useMM) {
-+        // Purpur end
-         if (name == null) {
-             name = getName();
-         }
-        this.getHandle().listName = name.equals(getName()) ? null : CraftChatMessage.fromStringOrNull(name);
-+        this.getHandle().listName = name.equals(getName()) ? null : useMM ? io.papermc.paper.adventure.PaperAdventure.asVanilla(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(name)) : CraftChatMessage.fromStringOrNull(name); // Purpur
-         for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
-             if (player.getBukkitEntity().canSee(this)) {
-                 player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
-@@ -3154,5 +3159,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     public boolean usesPurpurClient() {
-         return getHandle().purpurClient;
-     }
-+
-+    @Override
-+    public boolean isAfk() {
-+        return getHandle().isAfk();
-+    }
-+
-+    @Override
-+    public void setAfk(boolean setAfk) {
-+        getHandle().setAfk(setAfk);
-+    }
-+
-+    @Override
-+    public void resetIdleTimer() {
-+        getHandle().resetLastActionTime();
-+    }
-     // Purpur end
- }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 2f684a8f976f1f1a18c31f4c1a7eba9080099e55..c517873abdcb1e5334ba9e7a1c2f06bbbc411f87 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -174,8 +174,16 @@ public class PurpurConfig {
-     }
- 
-     public static String cannotRideMob = "<red>You cannot mount that mob";
-+    public static String afkBroadcastAway = "<yellow><italic>%s is now AFK";
-+    public static String afkBroadcastBack = "<yellow><italic>%s is no longer AFK";
-+    public static String afkTabListPrefix = "[AFK] ";
-+    public static String afkTabListSuffix = "";
-     private static void messages() {
-         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
-+        afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
-+        afkBroadcastBack = getString("settings.messages.afk-broadcast-back", afkBroadcastBack);
-+        afkTabListPrefix = getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix);
-+        afkTabListSuffix = getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix);
-     }
- 
-     public static int barrelRows = 3;
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 08b8d90ebdfd3937b6c32a7f18f08aeeaa4a8189..63b5be2433b5fba5c4139a9c1dbaaa79655fba7a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -92,6 +92,24 @@ public class PurpurWorldConfig {
-         return value.isEmpty() ? fallback : value;
-     }
- 
-+    public boolean idleTimeoutKick = true;
-+    public boolean idleTimeoutTickNearbyEntities = true;
-+    public boolean idleTimeoutCountAsSleeping = false;
-+    public boolean idleTimeoutUpdateTabList = false;
-+    public boolean idleTimeoutTargetPlayer = true;
-+    private void playerSettings() {
-+        if (PurpurConfig.version < 19) {
-+            boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
-+            set("gameplay-mechanics.player.idle-timeout.mods-target", null);
-+            set("gameplay-mechanics.player.idle-timeout.mobs-target", oldVal);
-+        }
-+        idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
-+        idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
-+        idleTimeoutCountAsSleeping = getBoolean("gameplay-mechanics.player.idle-timeout.count-as-sleeping", idleTimeoutCountAsSleeping);
-+        idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
-+        idleTimeoutTargetPlayer = getBoolean("gameplay-mechanics.player.idle-timeout.mobs-target", idleTimeoutTargetPlayer);
-+    }
-+
-     public boolean babiesAreRidable = true;
-     public boolean untamedTamablesAreRidable = true;
-     public boolean useNightVisionWhenRiding = false;
-diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index e881584d38dc354204479863f004e974a0ac6c07..5fde2a74385e621ae96922fd8aa6e386f5b780bb 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
-+++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -199,6 +199,7 @@ public class ActivationRange
-                 continue;
-             }
- 
-+            if (!player.level.purpurConfig.idleTimeoutTickNearbyEntities && player.isAfk()) continue; // Purpur
-             // Paper start
-             int worldHeight = world.getHeight();
-             ActivationRange.maxBB = player.getBoundingBox().inflate( maxRange, worldHeight, maxRange );