Updated Upstream (Pufferfish)

Upstream has released updates that appear to apply and compile correctly Pufferfish Changes: pufferfish-gg/Pufferfish@f05b0e9 Updated Upstream (Paper) pufferfish-gg/Pufferfish@9a82b86 Updated Upstream (Paper) pufferfish-gg/Pufferfish@c6ec7a0 Updated Upstream (Paper) pufferfish-gg/Pufferfish@c789f72 Updated Upstream (Paper) pufferfish-gg/Pufferfish@9ddaa1a Updated Upstream (Paper) pufferfish-gg/Pufferfish@3554f78 Updated Upstream (Paper) pufferfish-gg/Pufferfish@a9e9d99 Updated Upstream (Paper) pufferfish-gg/Pufferfish@09a2f81 Updated Upstream (Paper) pufferfish-gg/Pufferfish@63ce67d Updated Upstream (Paper) pufferfish-gg/Pufferfish@8abd47b Updated Upstream (Paper) pufferfish-gg/Pufferfish@3415da0 Updated Upstream (Paper) pufferfish-gg/Pufferfish@cfa3c61 Updated Upstream (Paper) pufferfish-gg/Pufferfish@0a8641d 1.21.3 Update pufferfish-gg/Pufferfish@784d72f Updated Upstream (Paper) pufferfish-gg/Pufferfish@40e1ad0 Updated Upstream (Paper) pufferfish-gg/Pufferfish@95ef348 Make iterator counting in IteratorSafeOrderedReferenceSet thread-safe for async mob spawning (#109) pufferfish-gg/Pufferfish@34c0042 Updated Upstream (Paper)
2026-02-21 10:27:44 +01:00 · 2024-11-30 20:49:52 -08:00
parent e141f680fd
commit 7f6f667142
294 changed files with 902 additions and 1476 deletions
--- a/patches/server/0135-Config-to-make-Creepers-explode-on-death.patch
+++ b/patches/server/0135-Config-to-make-Creepers-explode-on-death.patch
@@ -1,72 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Encode42 <me@encode42.dev>
-Date: Tue, 16 Mar 2021 19:50:58 -0400
-Subject: [PATCH] Config to make Creepers explode on death
-
-Creepers exploded after being killed in the alpha days. This brings that back.
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 78da4454fb6eccb1d17d1f0cb19013883437a23e..0bce10c1cbf9f1788817a2834ec0efa04dd17752 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -65,6 +65,7 @@ public class Creeper extends Monster {
-     private int prevSpacebarCharge = 0;
-     private int powerToggleDelay = 0;
-     // Purpur end
-+    private boolean exploding = false; // Purpur - Config to make Creepers explode on death
- 
-     public Creeper(EntityType<? extends Creeper> type, Level world) {
-         super(type, world);
-@@ -270,6 +271,16 @@ public class Creeper extends Monster {
-         return this.level().purpurConfig.creeperTakeDamageFromWater;
-     }
- 
-+    // Purpur start - Config to make Creepers explode on death
-+    @Override
-+    protected org.bukkit.event.entity.EntityDeathEvent dropAllDeathLoot(ServerLevel world, DamageSource damageSource) {
-+        if (!this.exploding && this.level().purpurConfig.creeperExplodeWhenKilled && damageSource.getEntity() instanceof net.minecraft.server.level.ServerPlayer) {
-+            this.explodeCreeper();
-+        }
-+        return super.dropAllDeathLoot(world, damageSource);
-+    }
-+    // Purpur end - Config to make Creepers explode on death
-+
-     @Override
-     protected SoundEvent getHurtSound(DamageSource source) {
-         return SoundEvents.CREEPER_HURT;
-@@ -358,6 +369,7 @@ public class Creeper extends Monster {
- 
-     public void explodeCreeper() {
-         Level world = this.level();
-+        this.exploding = true; // Purpur - Config to make Creepers explode on death
- 
-         if (world instanceof ServerLevel worldserver) {
-             float f = this.isPowered() ? 2.0F : 1.0F;
-@@ -379,6 +391,7 @@ public class Creeper extends Monster {
-             // CraftBukkit end
-         }
- 
-+        this.exploding = false; // Purpur - Config to make Creepers explode on death
-     }
- 
-     private void spawnLingeringCloud() {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 66c5250d3a4d838e5437af829f4adf67d149652c..062b2805f55e77eb3d451332a4a2f902fd144a29 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -875,6 +875,7 @@ public class PurpurWorldConfig {
-     public boolean creeperAllowGriefing = true;
-     public boolean creeperBypassMobGriefing = false;
-     public boolean creeperTakeDamageFromWater = false;
-+    public boolean creeperExplodeWhenKilled = false;
-     private void creeperSettings() {
-         creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
-         creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
-@@ -890,6 +891,7 @@ public class PurpurWorldConfig {
-         creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
-         creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing);
-         creeperTakeDamageFromWater = getBoolean("mobs.creeper.takes-damage-from-water", creeperTakeDamageFromWater);
-+        creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);
-     }
- 
-     public boolean dolphinRidable = false;