From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Encode42 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 afac9d1ca9a42903afb7e354134bdf4451db889b..1a47785329e3f1e52d91d64e6cd321af03945154 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 type, Level world) { @@ -155,6 +156,14 @@ public class Creeper extends Monster implements PowerableMob { public boolean isSensitiveToWater() { 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); + } // Purpur end @Override @@ -360,6 +369,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; @@ -377,7 +387,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 8742fb33534fe0128bf3d7473abce290458bcb95..3242681c6e13df224ef3bc07113ba026849c3f40 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -848,6 +848,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); @@ -862,6 +863,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;