mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 12:41:50 +01:00
b31089a929
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: d264e972 #591: Add option for a consumer before spawning an item 1c537fce #590: Add spawn and transform reasons for piglin zombification. CraftBukkit Changes: ee5006d1 #810: Add option for a consumer before spawning an item f6a39d3c #809: Add spawn and transform reasons for piglin zombification. 0c24068a Organise imports Spigot Changes: bff52619 Organise imports
35 lines
2 KiB
Diff
35 lines
2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Sun, 11 Jun 2017 21:01:18 +0100
|
|
Subject: [PATCH] provide a configurable option to disable creeper lingering
|
|
effect spawns
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
index 9d1cddc6038f0fd0286e4a32013ae98ff0b00dd1..90ca51dfdbb3045dd528450225cba96f5834166e 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -336,4 +336,10 @@ public class PaperWorldConfig {
|
|
parrotsHangOnBetter = getBoolean("parrots-are-unaffected-by-player-movement", false);
|
|
log("Parrots are unaffected by player movement: " + parrotsHangOnBetter);
|
|
}
|
|
+
|
|
+ public boolean disableCreeperLingeringEffect;
|
|
+ private void setDisableCreeperLingeringEffect() {
|
|
+ disableCreeperLingeringEffect = getBoolean("disable-creeper-lingering-effect", false);
|
|
+ log("Creeper lingering effect: " + disableCreeperLingeringEffect);
|
|
+ }
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
|
|
index c649e391b0f6d94efb84e408ca4f61ef0eddef0a..78d136eed54b815f5c866d3ab0d96c1d819bc6b2 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
|
|
@@ -227,7 +227,7 @@ public class EntityCreeper extends EntityMonster {
|
|
private void createEffectCloud() {
|
|
Collection<MobEffect> collection = this.getEffects();
|
|
|
|
- if (!collection.isEmpty()) {
|
|
+ if (!collection.isEmpty() && !world.paperConfig.disableCreeperLingeringEffect) { // Paper
|
|
EntityAreaEffectCloud entityareaeffectcloud = new EntityAreaEffectCloud(this.world, this.locX(), this.locY(), this.locZ());
|
|
|
|
entityareaeffectcloud.setSource(this); // CraftBukkit
|