2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2017-06-11 22:13:59 +02:00
|
|
|
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
|
2020-05-06 11:48:49 +02:00
|
|
|
index eae1690cc6db99b2f3af70a121f83b455b0fb20d..39ab5457569684bc66cd67f5f9d2505ef9f304ab 100644
|
2017-06-11 22:13:59 +02:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2020-01-18 18:28:32 +01:00
|
|
|
@@ -334,4 +334,10 @@ public class PaperWorldConfig {
|
2017-06-11 22:13:59 +02:00
|
|
|
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
|
2020-05-06 11:48:49 +02:00
|
|
|
index cc9887d040c06e453f11e94bb260a4504a607301..374cf28fb42b13152f58fd63c4f0cb25eae6a2d9 100644
|
2017-06-11 22:13:59 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
|
2019-12-12 00:43:22 +01:00
|
|
|
@@ -228,7 +228,7 @@ public class EntityCreeper extends EntityMonster {
|
2018-12-17 06:18:06 +01:00
|
|
|
private void createEffectCloud() {
|
2019-01-01 04:15:55 +01:00
|
|
|
Collection<MobEffect> collection = this.getEffects();
|
2017-06-11 22:13:59 +02:00
|
|
|
|
|
|
|
- if (!collection.isEmpty()) {
|
|
|
|
+ if (!collection.isEmpty() && !world.paperConfig.disableCreeperLingeringEffect) { // Paper
|
2019-12-12 00:43:22 +01:00
|
|
|
EntityAreaEffectCloud entityareaeffectcloud = new EntityAreaEffectCloud(this.world, this.locX(), this.locY(), this.locZ());
|
2017-06-11 22:13:59 +02:00
|
|
|
|
2017-07-23 03:16:06 +02:00
|
|
|
entityareaeffectcloud.setSource(this); // CraftBukkit
|