mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-29 23:09:33 +01:00
459987d69f
improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
39 lines
1.8 KiB
Diff
39 lines
1.8 KiB
Diff
From 99b4835e40d1d4ede781bb22ee30b5683d2aff35 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 3507997fc3..7c2e0ddb77 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -367,4 +367,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 a1c343d77b..765123e3d2 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
|
|
@@ -214,7 +214,7 @@ public class EntityCreeper extends EntityMonster {
|
|
private void dF() {
|
|
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.setSource(this); // CraftBukkit
|
|
--
|
|
2.19.0
|
|
|