Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly Paper Changes: 4a97a7ca Add option to disable pillager patrols (#2626) 23e53aab Backport MC-160177 fix from 1.15 (#2702) 45089d59 Update upstream CB 761c24fa Fix stuck in sneak when changing worlds (MC-10657) (#2627)
2026-02-18 08:57:44 +01:00 · 2019-11-24 14:01:05 -06:00
parent cfd297a4c3
commit 84e7469798
42 changed files with 106 additions and 191 deletions
--- a/patches/server/0051-Implement-AFK-API.patch
+++ b/patches/server/0051-Implement-AFK-API.patch
@@ -0,0 +1,303 @@
+From cffd71583a96d5d1517e9112eafe5db20974bc3d 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] Implement AFK API
+
+---
+ .../java/net/minecraft/server/Entity.java     |  1 +
+ .../net/minecraft/server/EntityHuman.java     |  9 ++++
+ .../net/minecraft/server/EntityPlayer.java    | 43 +++++++++++++++++++
+ .../net/minecraft/server/IEntityAccess.java   | 34 ++++++---------
+ .../net/minecraft/server/IEntitySelector.java |  2 +
+ .../minecraft/server/PlayerConnection.java    | 10 +++++
+ .../net/minecraft/server/WorldServer.java     |  4 +-
+ .../net/pl3x/purpur/PurpurWorldConfig.java    | 16 +++++++
+ .../craftbukkit/entity/CraftPlayer.java       | 17 ++++++++
+ .../java/org/spigotmc/ActivationRange.java    |  1 +
+ 10 files changed, 113 insertions(+), 24 deletions(-)
+
+diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
+index 468d6cc3e1..5377dc1583 100644
+--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
+@@ -1396,6 +1396,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+         return MathHelper.c(f * f + f1 * f1 + f2 * f2);
+     }
+ 
+    public double getDistanceSq(double x, double y, double z) { return e(x, y, z); } // Purpur - OBFHELPER
+     public double e(double d0, double d1, double d2) {
+         double d3 = this.locX - d0;
+         double d4 = this.locY - d1;
+diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
+index 8b5ceec8d8..3610611299 100644
+--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
+@@ -86,6 +86,15 @@ public abstract class EntityHuman extends EntityLiving {
+     }
+     // CraftBukkit end
+ 
+    // Purpur start
+    public void setAfk(boolean setAfk){
+    }
+
+    public boolean isAfk() {
+        return false;
+    }
+    // Purpur end
+
+     public EntityHuman(World world, GameProfile gameprofile) {
+         super(EntityTypes.PLAYER, world);
+         this.bY = ItemStack.a;
+diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
+index 9a76d14a04..d88fa128c7 100644
+--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
+@@ -1607,8 +1607,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+ 
+     public void resetIdleTimer() {
+         this.cm = SystemUtils.getMonotonicMillis();
+        setAfk(false); // Purpur
+     }
+ 
+    // Purpur start
+    private boolean isAfk = false;
+
+    @Override
+    public void setAfk(boolean setAfk) {
+        if (this.isAfk == setAfk) {
+            return;
+        }
+
+        net.pl3x.purpur.event.PlayerAFKEvent event = new net.pl3x.purpur.event.PlayerAFKEvent(getBukkitEntity(), setAfk, world.purpurConfig.idleTimeoutKick, setAfk ? world.purpurConfig.idleTimeoutBroadcastAway : world.purpurConfig.idleTimeoutBroadcastBack);
+        if (!event.callEvent() || event.shouldKick()) {
+            return;
+        }
+
+        this.isAfk = setAfk;
+
+        if (!setAfk) {
+            resetIdleTimer();
+        }
+
+        if (event.getBroadcastMsg() != null && !event.getBroadcastMsg().isEmpty()) {
+            ((WorldServer) world).getMinecraftServer().server.broadcastMessage(event.getBroadcastMsg().replace("{player}", getName()));
+        }
+
+        if (world.purpurConfig.idleTimeoutUpdateTabList) {
+            getBukkitEntity().setPlayerListName((setAfk ? "[AFK] " : "") + getName());
+        }
+
+        ((WorldServer) world).everyoneSleeping();
+    }
+
+    @Override
+    public boolean isAfk() {
+        return isAfk;
+    }
+
+    @Override
+    public boolean isCollidable(boolean ignoreClimbing) {
+        return !isAfk() && super.isCollidable(ignoreClimbing);
+    }
+    // Purpur end
+
+     public ServerStatisticManager getStatisticManager() {
+         return this.serverStatisticManager;
+     }
+diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
+index 9aaa75e959..70fe852791 100644
+--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
+@@ -116,28 +116,18 @@ public interface IEntityAccess {
+         return entityhuman;
+     }
+ 
+-    default boolean isPlayerNearby(double d0, double d1, double d2, double d3) {
+-        Iterator iterator = this.getPlayers().iterator();
+-
+-        double d4;
+-
+-        do {
+-            EntityHuman entityhuman;
+-
+-            do {
+-                do {
+-                    if (!iterator.hasNext()) {
+-                        return false;
+-                    }
+-
+-                    entityhuman = (EntityHuman) iterator.next();
+-                } while (!IEntitySelector.f.test(entityhuman));
+-            } while (!IEntitySelector.b.test(entityhuman));
+-
+-            d4 = entityhuman.e(d0, d1, d2);
+-        } while (d3 >= 0.0D && d4 >= d3 * d3);
+-
+-        return true;
+    // Purpur start
+    default boolean isPlayerNearby(double x, double y, double z, double distance) {
+        double distanceSq = distance * distance;
+        for (EntityHuman player : getPlayers()) {
+            if (IEntitySelector.notSpectator().test(player) && IEntitySelector.isLivingAlive().test(player) && IEntitySelector.notAfk.test(player)) {
+                if (distance < 0.0D || player.getDistanceSq(x, y, z) < distanceSq) {
+                    return true;
+                }
+            }
+        }
+        return false;
+        // Purpur end
+     }
+ 
+     @Nullable
+diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
+index 0bac6e4245..df79e4af9d 100644
+--- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
+@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
+ public final class IEntitySelector {
+ 
+     public static final Predicate<Entity> a = Entity::isAlive;
+    public static Predicate<EntityLiving> isLivingAlive() { return b; } // Purpur - OBFHELPER
+     public static final Predicate<EntityLiving> b = EntityLiving::isAlive;
+     public static final Predicate<Entity> c = (entity) -> {
+         return entity.isAlive() && !entity.isVehicle() && !entity.isPassenger();
+@@ -23,6 +24,7 @@ public final class IEntitySelector {
+     public static final Predicate<Entity> f = (entity) -> {
+         return !entity.isSpectator();
+     };
+    public static Predicate<EntityHuman> notAfk = (player) -> !player.isAfk(); // Purpur
+ 
+     public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
+         double d4 = d3 * d3;
+diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
+index 30595523e6..6f584d515f 100644
+--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
+@@ -274,6 +274,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
+         }
+ 
+         if (this.player.F() > 0L && this.minecraftServer.getIdleTimeout() > 0 && SystemUtils.getMonotonicMillis() - this.player.F() > (long) (this.minecraftServer.getIdleTimeout() * 1000 * 60)) {
+            // Purpur start
+            this.player.setAfk(true);
+            if (!this.player.world.purpurConfig.idleTimeoutKick) {
+                return;
+            }
+            // Purpur end
+             this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854
+             this.disconnect(new ChatMessage("multiplayer.disconnect.idling", new Object[0]));
+         }
+@@ -490,6 +496,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+                     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()) this.player.resetIdleTimer(); // Purpur
+
+                     // Skip the first time we do this
+                     if (true) { // Spigot - don't skip any move events
+                         Location oldTo = to.clone();
+@@ -1150,6 +1158,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+                                 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()) this.player.resetIdleTimer(); // 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/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
+index 62e938a78f..5e51dbf172 100644
+--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
+@@ -359,7 +359,7 @@ public class WorldServer extends World {
+         }
+ 
+         if (this.C && this.players.stream().noneMatch((entityplayer) -> {
+-            return !entityplayer.isSpectator() && !entityplayer.isDeeplySleeping() && !entityplayer.fauxSleeping; // CraftBukkit
+            return !entityplayer.isSpectator() && !entityplayer.isDeeplySleeping() && !entityplayer.fauxSleeping && !(purpurConfig.idleTimeoutCountAsSleeping && entityplayer.isAfk()); // CraftBukkit // Purpur
+         })) {
+             this.C = false;
+             if (this.getGameRules().getBoolean(GameRules.DO_DAYLIGHT_CYCLE)) {
+@@ -626,7 +626,7 @@ public class WorldServer extends World {
+             while (iterator.hasNext()) {
+                 EntityPlayer entityplayer = (EntityPlayer) iterator.next();
+ 
+-                if (entityplayer.isSpectator() || (entityplayer.fauxSleeping && !entityplayer.isSleeping())) { // CraftBukkit
+                if (entityplayer.isSpectator() || (entityplayer.fauxSleeping && !entityplayer.isSleeping()) || (purpurConfig.idleTimeoutCountAsSleeping && entityplayer.isAfk())) { // CraftBukkit // Purpur
+                     ++i;
+                 } else if (entityplayer.isSleeping()) {
+                     ++j;
+diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+index 059cf85f4f..0764be9d1a 100644
+--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+@@ -1,6 +1,7 @@
+ package net.pl3x.purpur;
+ 
+ import com.destroystokyo.paper.PaperWorldConfig;
+import org.bukkit.ChatColor;
+ import org.bukkit.configuration.file.YamlConfiguration;
+ import org.spigotmc.SpigotWorldConfig;
+ 
+@@ -131,6 +132,21 @@ public class PurpurWorldConfig {
+         limitVillagerIronGolemSpawns = getInt("limit-villager-iron-golem-spawns", limitVillagerIronGolemSpawns);
+     }
+ 
+    public boolean idleTimeoutKick = true;
+    public boolean idleTimeoutTickNearbyEntities = false;
+    public boolean idleTimeoutCountAsSleeping = false;
+    public boolean idleTimeoutUpdateTabList = true;
+    public String idleTimeoutBroadcastAway = "&e&o{player} is now AFK";
+    public String idleTimeoutBroadcastBack = "&e&o{player} is no longer AFK";
+    private void playerIdleTimeoutSettings() {
+        idleTimeoutKick = getBoolean("idle-timeout.kick-if-idle", idleTimeoutKick);
+        idleTimeoutTickNearbyEntities = getBoolean("idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
+        idleTimeoutCountAsSleeping = getBoolean("idle-timeout.count-as-sleeping", idleTimeoutCountAsSleeping);
+        idleTimeoutUpdateTabList = getBoolean("idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
+        idleTimeoutBroadcastAway = ChatColor.translateAlternateColorCodes('&', getString("idle-timeout.broadcast.away", idleTimeoutBroadcastAway));
+        idleTimeoutBroadcastBack = ChatColor.translateAlternateColorCodes('&', getString("idle-timeout.broadcast.back", idleTimeoutBroadcastBack));
+    }
+
+     public int elytraDamagePerSecond = 1;
+     public double elytraDamageMultiplyBySpeed = 0;
+     public boolean elytraIgnoreUnbreaking = false;
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+index e920545df1..c098de3152 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -2088,4 +2088,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+         return spigot;
+     }
+     // Spigot end
+
+    // Purpur start
+    @Override
+    public boolean isAfk() {
+        return getHandle().isAfk();
+    }
+
+    @Override
+    public void setAfk(boolean setAfk) {
+        getHandle().setAfk(setAfk);
+    }
+
+    @Override
+    public void resetIdleTimer() {
+        getHandle().resetIdleTimer();
+    }
+    // Purpur end
+ }
+diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
+index 92601c581c..185717c804 100644
+--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
+@@ -128,6 +128,7 @@ public class ActivationRange
+         {
+ 
+             player.activatedTick = MinecraftServer.currentTick;
+            if (!player.world.purpurConfig.idleTimeoutTickNearbyEntities && player.isAfk()) continue; // Purpur
+             maxBB = player.getBoundingBox().grow( maxRange, 256, maxRange );
+             ActivationType.MISC.boundingBox = player.getBoundingBox().grow( miscActivationRange, 256, miscActivationRange );
+             ActivationType.RAIDER.boundingBox = player.getBoundingBox().grow( raiderActivationRange, 256, raiderActivationRange );
+-- 
+2.24.0.rc1
+