mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
cceae2cdb3
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@1845cec Fix death message containing empty string (#8656) PaperMC/Paper@326a65e [ci skip] add missing final newline (#8659) PaperMC/Paper@0148283 Fix locateNearestBiome nullability check (#8662) PaperMC/Paper@3822cc8 Update paperweight to 1.4.0 PaperMC/Paper@adb8e49 Fix fire charge not being consumed igniting a creeper (#8652)
72 lines
3.4 KiB
Diff
72 lines
3.4 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 99eb17fcc112a4a770903b28fcbe1b9dfce495e2..7287d2bddc28f50987964862ce7eca1dc4d9420a 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) {
|
|
@@ -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 13f8050acaa8d50e759b320ba031e2afbf03f611..214c46eed9e2460da40fbc3c8be7d6d9d885d7cb 100644
|
|
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
@@ -840,6 +840,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);
|
|
@@ -854,6 +855,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;
|