mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
b21daa9622
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e16fefb [ci skip] add 'accepted' to Done project category (#9429) PaperMC/Paper@171ba7c Move Log4j plugins to own source set (#9428) PaperMC/Paper@4356758 Call missing BlockDispenseEvents (#8518) PaperMC/Paper@c0936a7 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9440) PaperMC/Paper@12c9700 Fix ThrownEggHatchEvent#setHatching (#9448)
72 lines
3.5 KiB
Diff
72 lines
3.5 KiB
Diff
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 fd46c04f4ff53c44d6605e1af561ef9c9db38b4c..0d9ff20451ed7f82053ffd92538f78653b652dd4 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;
|
|
@@ -359,6 +368,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 2bc71ce8a6a6525934f1885917e8561d94d752c5..b240edfb3c059d4e93a4d6c58dc124c8523aac6d 100644
|
|
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
@@ -856,6 +856,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);
|
|
@@ -870,6 +871,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;
|