Updated Upstream (Pufferfish) (#1575)

Upstream has released updates that appear to apply and compile correctly Pufferfish Changes: pufferfish-gg/Pufferfish@c9f4e20 Final 1.20.4 Update pufferfish-gg/Pufferfish@1f3ad02 Final 1.20.4 update, for realzies pufferfish-gg/Pufferfish@b1ab664 Enable SIMD on java 21 pufferfish-gg/Pufferfish@0674c2b 1.21 compiles pufferfish-gg/Pufferfish@98ea973 Fix 1.21 version checkers pufferfish-gg/Pufferfish@68f859c Fix lambda/tick guard patch pufferfish-gg/Pufferfish@eaa18d5 Updated Upstream (Paper) pufferfish-gg/Pufferfish@1d72eea Updated Upstream (Paper) pufferfish-gg/Pufferfish@1d3c743 Update pufferfish version detector stuff pufferfish-gg/Pufferfish@5e30963 Fix crash bug pufferfish-gg/Pufferfish@12571eb Use mojmapped paperclip jar instead (CI only) pufferfish-gg/Pufferfish@4d16ae0 Drop a patch - moonrise includes it pufferfish-gg/Pufferfish@52c2d05 Revert "Drop a patch - moonrise includes it" pufferfish-gg/Pufferfish@bdb56f1 Fix entity interactions with fluids pufferfish-gg/Pufferfish@469e5c1 Updated Upstream (Paper) pufferfish-gg/Pufferfish@d75961f 1.21.1 Update (Updated Upstream (Paper))
2026-02-18 17:07:43 +01:00 · 2024-08-15 14:07:11 -07:00
parent 3f790ac3a7
commit 201e928fa6
346 changed files with 1012 additions and 1814 deletions
--- a/patches/server/0070-Entity-lifespan.patch
+++ b/patches/server/0070-Entity-lifespan.patch
@@ -1,111 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 11 Jul 2020 19:41:34 -0500
-Subject: [PATCH] Entity lifespan
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4319a191f03caa56baeecdc537b61aacfa2291cd..1908af9183d290a1a6815866ba10172d05ff56d1 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2747,6 +2747,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-             AABB axisalignedbb = entity.getBoundingBox();
- 
-             if (this.player.canInteractWithEntity(axisalignedbb, io.papermc.paper.configuration.GlobalConfiguration.get().misc.clientInteractionLeniencyDistance.or(1.0D))) { // Paper - configurable lenience value for interact range
-+                if (entity instanceof Mob mob) mob.ticksSinceLastInteraction = 0; // Purpur
-                 packet.dispatch(new ServerboundInteractPacket.Handler() {
-                     private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit
-                         ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand);
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 99b227dc5940ddc16d41b2e37c4683268b9e4112..1a8b081aae4bbe538eb3230d415583f318ade86f 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -146,6 +146,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
-     private BlockPos restrictCenter;
-     private float restrictRadius;
- 
-+    public int ticksSinceLastInteraction; // Purpur
-     public boolean aware = true; // CraftBukkit
- 
-     protected Mob(EntityType<? extends Mob> type, Level world) {
-@@ -331,6 +332,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
-                 entityliving = null;
-             }
-         }
-+        if (entityliving instanceof net.minecraft.server.level.ServerPlayer) this.ticksSinceLastInteraction = 0; // Purpur
-         this.target = entityliving;
-         return true;
-         // CraftBukkit end
-@@ -373,8 +375,28 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
-         }
- 
-         this.level().getProfiler().pop();
-+        incrementTicksSinceLastInteraction(); // Purpur
-     }
- 
-+    // Purpur start
-+    private void incrementTicksSinceLastInteraction() {
-+        ++this.ticksSinceLastInteraction;
-+        if (getRider() != null) {
-+            this.ticksSinceLastInteraction = 0;
-+            return;
-+        }
-+        if (this.level().purpurConfig.entityLifeSpan <= 0) {
-+            return; // feature disabled
-+        }
-+        if (!this.removeWhenFarAway(0) || isPersistenceRequired() || requiresCustomPersistence() || hasCustomName()) {
-+            return; // mob persistent
-+        }
-+        if (this.ticksSinceLastInteraction > this.level().purpurConfig.entityLifeSpan) {
-+            this.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DISCARD);
-+        }
-+    }
-+    // Purpur end
-+
-     @Override
-     protected void playHurtSound(DamageSource damageSource) {
-         this.resetAmbientSoundTime();
-@@ -549,6 +571,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
-         }
- 
-         nbt.putBoolean("Bukkit.Aware", this.aware); // CraftBukkit
-+        nbt.putInt("Purpur.ticksSinceLastInteraction", this.ticksSinceLastInteraction); // Purpur
-     }
- 
-     @Override
-@@ -626,6 +649,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
-             this.aware = nbt.getBoolean("Bukkit.Aware");
-         }
-         // CraftBukkit end
-+        // Purpur start
-+        if (nbt.contains("Purpur.ticksSinceLastInteraction")) {
-+            this.ticksSinceLastInteraction = nbt.getInt("Purpur.ticksSinceLastInteraction");
-+        }
-+        // Purpur end
-     }
- 
-     @Override
-@@ -1743,6 +1771,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
-             this.playAttackSound();
-         }
- 
-+        if (target instanceof net.minecraft.server.level.ServerPlayer) this.ticksSinceLastInteraction = 0; // Purpur
-         return flag;
-     }
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e1c2080ffd8be35c224e0e41a69b6a98c4b932dc..65b5ddde3496d1b04bedd410675a548f662aa073 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -124,6 +124,11 @@ public class PurpurWorldConfig {
-         elytraDamagePerTridentBoost = getInt("gameplay-mechanics.elytra.damage-per-boost.trident", elytraDamagePerTridentBoost);
-     }
- 
-+    public int entityLifeSpan = 0;
-+    private void entitySettings() {
-+        entityLifeSpan = getInt("gameplay-mechanics.entity-lifespan", entityLifeSpan);
-+    }
-+
-     public List<Item> itemImmuneToCactus = new ArrayList<>();
-     public List<Item> itemImmuneToExplosion = new ArrayList<>();
-     public List<Item> itemImmuneToFire = new ArrayList<>();