diff --git a/Spigot-Server-Patches/0351-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0351-Add-More-Creeper-API.patch index cd646c2c7d..a2b7a96c1e 100644 --- a/Spigot-Server-Patches/0351-Add-More-Creeper-API.patch +++ b/Spigot-Server-Patches/0351-Add-More-Creeper-API.patch @@ -1,11 +1,11 @@ -From db14fd6e2142e094d692eee5ad0c8210e78d4fcd Mon Sep 17 00:00:00 2001 +From b68ac5de0a95fe88718aaaf7e2c4621543a836da Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 11:50:26 -0500 Subject: [PATCH] Add More Creeper API diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index 19022b6e24..1729297766 100644 +index 19022b6e2..321e00cef 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -14,7 +14,7 @@ public class EntityCreeper extends EntityMonster { @@ -33,6 +33,15 @@ index 19022b6e24..1729297766 100644 int i = this.dz(); +@@ -102,7 +105,7 @@ public class EntityCreeper extends EntityMonster { + this.a(SoundEffects.ENTITY_CREEPER_PRIMED, 1.0F, 0.5F); + } + +- this.fuseTicks += i; ++ this.fuseTicks += this.isIgnited() ? 1 : i; // Paper - workaround now that we aren't letting it get re-set every tick - GH-1389 + if (this.fuseTicks < 0) { + this.fuseTicks = 0; + } @@ -151,12 +154,21 @@ public class EntityCreeper extends EntityMonster { return LootTables.x; } @@ -82,7 +91,7 @@ index 19022b6e24..1729297766 100644 public boolean canCauseHeadDrop() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java -index ffebb54caa..ab2b20a0d4 100644 +index ffebb54ca..ab2b20a0d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java @@ -76,4 +76,22 @@ public class CraftCreeper extends CraftMonster implements Creeper {