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 acc548126a06f40ec3473301b36367e107050086..13a1ede4fc72ef2811250ac4991ecd2bc10dbe95 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java @@ -60,6 +60,7 @@ public class Creeper extends Monster implements PowerableMob { public int explosionRadius = 3; private int droppedSkulls; // Purpur start + private boolean exploding = false; private int spacebarCharge = 0; private int prevSpacebarCharge = 0; private int powerToggleDelay = 0; @@ -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 ff50c2f80efb1a721e06ffd0059802a3f89d434e..3e597d7ed6a6dd1c5726e76e0fe76687a3cb4b03 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -771,6 +771,7 @@ public class PurpurWorldConfig { public boolean creeperAllowGriefing = true; public boolean creeperBypassMobGriefing = false; public boolean creeperTakeDamageFromWater = false; + public boolean creeperExplodeWhenKilled = false; private void creeperSettings() { if (PurpurConfig.version < 10) { double oldValue = getDouble("mobs.creeper.attributes.max-health", creeperMaxHealth); @@ -782,6 +783,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 double dolphinMaxHealth = 10.0D;