TakeV/Paper
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #731 from electronicboy/master

Browse source 
Provide a configurable option to disable creeper lingering effect spawns
This commit is contained in:
kashike 2017-06-11 13:31:32 -07:00 committed by GitHub
parent 4eff799e80 06a34ec40a
commit ec78d78ee8
1 changed files with 38 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Spigot-Server-Patches/0213-provide-a-configurable-option-to-disable-creeper-lin.patch Normal file
View file

@ -0,0 +1,38 @@
From 41485db87dc97472c2155e45146a5118ae61be07 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 1ce3aaa8c..54d081fd2 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -422,4 +422,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 4a5e87b5f..6a653f8b5 100644
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
@@ -222,7 +222,7 @@ public class EntityCreeper extends EntityMonster {
private void ds() {
Collection 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.setRadius(2.5F);
--
2.13.1