mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-24 08:06:41 +01:00
36 lines
2 KiB
Diff
36 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/world/entity/monster/EntityCreeper.java b/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java
|
||
|
|
index 4106cce3071ac8bfe33e94b0fc7f67cfeef214b4..08292753f925f33d75f3aca835c1fd19494b22ec 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java
|
||
|
|
@@ -262,7 +262,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
|