From ac93477cc0acf2ab8d2d7826e0cc365297c57562 Mon Sep 17 00:00:00 2001 From: Encode42 Date: Wed, 17 Mar 2021 15:22:56 -0400 Subject: [PATCH] Config to make Creepers explode on death (#201) --- ...ig-to-make-Creepers-explode-on-death.patch | 69 +++++++++++++++++++ ...ig-to-make-Creepers-explode-on-death.patch | 69 +++++++++++++++++++ 2 files changed, 138 insertions(+) create mode 100644 patches/server/0183-Config-to-make-Creepers-explode-on-death.patch create mode 100644 patches/server/0184-Config-to-make-Creepers-explode-on-death.patch diff --git a/patches/server/0183-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0183-Config-to-make-Creepers-explode-on-death.patch new file mode 100644 index 000000000..89be77f4f --- /dev/null +++ b/patches/server/0183-Config-to-make-Creepers-explode-on-death.patch @@ -0,0 +1,69 @@ +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/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java +index 523988bcc0607198dfb73afca5932ed6dd82cca1..6b3b1303862cd2ea90b5158e51ce94d3ad81d463 100644 +--- a/src/main/java/net/minecraft/server/EntityCreeper.java ++++ b/src/main/java/net/minecraft/server/EntityCreeper.java +@@ -23,6 +23,7 @@ public class EntityCreeper extends EntityMonster { + private int spacebarCharge = 0; + private int prevSpacebarCharge = 0; + private int powerToggleDelay = 0; ++ private boolean exploding = false; + // Purpur end + + public EntityCreeper(EntityTypes entitytypes, World world) { +@@ -102,6 +103,14 @@ public class EntityCreeper extends EntityMonster { + public void initAttributes() { + this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue(this.world.purpurConfig.creeperMaxHealth); + } ++ ++ protected org.bukkit.event.entity.EntityDeathEvent d(DamageSource damagesource) { ++ if (!exploding && this.world.purpurConfig.creeperExplodeWhenKilled && damagesource.getEntity() instanceof EntityPlayer) { ++ this.explode(); ++ } ++ ++ return super.d(damagesource); ++ } + // Purpur end + + @Override +@@ -287,6 +296,7 @@ public class EntityCreeper extends EntityMonster { + } + + public void explode() { ++ this.exploding = true; // Purpur + if (!this.world.isClientSide) { + Explosion.Effect explosion_effect = this.world.getGameRules().getBoolean(GameRules.MOB_GRIEFING) && world.purpurConfig.creeperAllowGriefing ? Explosion.Effect.DESTROY : Explosion.Effect.NONE; // Purpur + float f = this.isPowered() ? 2.0F : 1.0F; +@@ -306,6 +316,7 @@ public class EntityCreeper extends EntityMonster { + // CraftBukkit end + } + ++ this.exploding = false; // Purpur + } + + private void createEffectCloud() { +diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +index e3dccf08a9b931f83e0c0a218f5db60e643f7674..5ce9e76e4aad9338b950a30cc90d7f2f77eba271 100644 +--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java ++++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +@@ -699,12 +699,14 @@ public class PurpurWorldConfig { + + public boolean creeperRidable = false; + public boolean creeperRidableInWater = false; ++ public boolean creeperExplodeWhenKilled = false; + public boolean creeperAllowGriefing = true; + public double creeperChargedChance = 0.0D; + public double creeperMaxHealth = 20.0D; + private void creeperSettings() { + creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable); + creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater); ++ creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled); + creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing); + creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance); + if (PurpurConfig.version < 10) { diff --git a/patches/server/0184-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0184-Config-to-make-Creepers-explode-on-death.patch new file mode 100644 index 000000000..e7adba2e4 --- /dev/null +++ b/patches/server/0184-Config-to-make-Creepers-explode-on-death.patch @@ -0,0 +1,69 @@ +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/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java +index 523988bcc0607198dfb73afca5932ed6dd82cca1..6b3b1303862cd2ea90b5158e51ce94d3ad81d463 100644 +--- a/src/main/java/net/minecraft/server/EntityCreeper.java ++++ b/src/main/java/net/minecraft/server/EntityCreeper.java +@@ -23,6 +23,7 @@ public class EntityCreeper extends EntityMonster { + private int spacebarCharge = 0; + private int prevSpacebarCharge = 0; + private int powerToggleDelay = 0; ++ private boolean exploding = false; + // Purpur end + + public EntityCreeper(EntityTypes entitytypes, World world) { +@@ -102,6 +103,14 @@ public class EntityCreeper extends EntityMonster { + public void initAttributes() { + this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue(this.world.purpurConfig.creeperMaxHealth); + } ++ ++ protected org.bukkit.event.entity.EntityDeathEvent d(DamageSource damagesource) { ++ if (!exploding && this.world.purpurConfig.creeperExplodeWhenKilled && damagesource.getEntity() instanceof EntityPlayer) { ++ this.explode(); ++ } ++ ++ return super.d(damagesource); ++ } + // Purpur end + + @Override +@@ -287,6 +296,7 @@ public class EntityCreeper extends EntityMonster { + } + + public void explode() { ++ this.exploding = true; // Purpur + if (!this.world.isClientSide) { + Explosion.Effect explosion_effect = this.world.getGameRules().getBoolean(GameRules.MOB_GRIEFING) && world.purpurConfig.creeperAllowGriefing ? Explosion.Effect.DESTROY : Explosion.Effect.NONE; // Purpur + float f = this.isPowered() ? 2.0F : 1.0F; +@@ -306,6 +316,7 @@ public class EntityCreeper extends EntityMonster { + // CraftBukkit end + } + ++ this.exploding = false; // Purpur + } + + private void createEffectCloud() { +diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +index fc584ec761f04dbcc45e7e058d19a0efb110c2c6..4968223d4711e6fea414ee7fba4904f5fc35c074 100644 +--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java ++++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +@@ -699,12 +699,14 @@ public class PurpurWorldConfig { + + public boolean creeperRidable = false; + public boolean creeperRidableInWater = false; ++ public boolean creeperExplodeWhenKilled = false; + public boolean creeperAllowGriefing = true; + public double creeperChargedChance = 0.0D; + public double creeperMaxHealth = 20.0D; + private void creeperSettings() { + creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable); + creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater); ++ creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled); + creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing); + creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance); + if (PurpurConfig.version < 10) {