add back pufferfish patches

2026-02-19 17:37:42 +01:00 · 2023-06-14 23:09:01 -07:00
parent c781eed75e
commit 91bfaff5af
357 changed files with 4861 additions and 684 deletions
--- a/patches/server/0141-Config-to-make-Creepers-explode-on-death.patch
+++ b/patches/server/0141-Config-to-make-Creepers-explode-on-death.patch
@@ -1,71 +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 6e80ea775596c5804b674234b7d59f4c941a49dc..ed5b0ec4c9616691c383067f8d949e63cb7c4497 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -63,6 +63,7 @@ public class Creeper extends Monster implements PowerableMob {
-     private int spacebarCharge = 0;
-     private int prevSpacebarCharge = 0;
-     private int powerToggleDelay = 0;
-+    private boolean exploding = false;
-     // Purpur end
- 
-     public Creeper(EntityType<? extends Creeper> type, Level world) {
-@@ -268,6 +269,14 @@ public class Creeper extends Monster implements PowerableMob {
-         return this.level().purpurConfig.creeperTakeDamageFromWater;
-     }
- 
-+    @Override
-+    protected org.bukkit.event.entity.EntityDeathEvent dropAllDeathLoot(DamageSource damagesource) {
-+        if (!exploding && this.level().purpurConfig.creeperExplodeWhenKilled && damagesource.getEntity() instanceof net.minecraft.server.level.ServerPlayer) {
-+            this.explodeCreeper();
-+        }
-+        return super.dropAllDeathLoot(damagesource);
-+    }
-+
-     @Override
-     protected SoundEvent getHurtSound(DamageSource source) {
-         return SoundEvents.CREEPER_HURT;
-@@ -358,6 +367,7 @@ public class Creeper extends Monster implements PowerableMob {
-     }
- 
-     public void explodeCreeper() {
-+        this.exploding = true; // Purpur
-         if (!this.level().isClientSide) {
-             float f = this.isPowered() ? 2.0F : 1.0F;
- 
-@@ -375,7 +385,7 @@ public class Creeper extends Monster implements PowerableMob {
-             }
-             // CraftBukkit end
-         }
-
-+        this.exploding = false; // Purpur
-     }
- 
-     private void spawnLingeringCloud() {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3172141c323f3f15de724cd85babc07d33397eef..89c2003d7b420369d554fe48c6d3296bb108b4dc 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -857,6 +857,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);
-@@ -871,6 +872,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;