From c5e9a169fa564f3b8119b6666f8df59d5a9b45c3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 10 May 2016 21:47:39 +1000 Subject: Minecraft 1.9.4 --- nms-patches/EntityWither.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'nms-patches/EntityWither.patch') diff --git a/nms-patches/EntityWither.patch b/nms-patches/EntityWither.patch index 1b925cd8..7acdbb78 100644 --- a/nms-patches/EntityWither.patch +++ b/nms-patches/EntityWither.patch @@ -1,8 +1,8 @@ --- a/net/minecraft/server/EntityWither.java +++ b/net/minecraft/server/EntityWither.java -@@ -5,6 +5,12 @@ - import java.util.Iterator; +@@ -6,6 +6,12 @@ import java.util.List; + import javax.annotation.Nullable; +// CraftBukkit start +import org.bukkit.craftbukkit.event.CraftEventFactory; @@ -13,9 +13,9 @@ public class EntityWither extends EntityMonster implements IRangedEntity { private static final DataWatcherObject a = DataWatcher.a(EntityWither.class, DataWatcherRegistry.b); -@@ -179,13 +185,38 @@ - if (this.cZ() > 0) { - i = this.cZ() - 1; +@@ -180,13 +186,38 @@ + if (this.da() > 0) { + i = this.da() - 1; if (i <= 0) { - this.world.createExplosion(this, this.locX, this.locY + (double) this.getHeadHeight(), this.locZ, 7.0F, false, this.world.getGameRules().getBoolean("mobGriefing")); - this.world.a(1023, new BlockPosition(this), 0); @@ -55,7 +55,7 @@ } } else { -@@ -276,6 +307,11 @@ +@@ -277,6 +308,11 @@ Block block = iblockdata.getBlock(); if (iblockdata.getMaterial() != Material.AIR && a(block)) { @@ -67,7 +67,7 @@ flag = this.world.setAir(blockposition, true) || flag; } } -@@ -289,7 +325,7 @@ +@@ -290,7 +326,7 @@ } if (this.ticksLived % 20 == 0) { @@ -75,4 +75,4 @@ + this.heal(1.0F, EntityRegainHealthEvent.RegainReason.REGEN); // CraftBukkit } - this.bE.setProgress(this.getHealth() / this.getMaxHealth()); + this.bF.setProgress(this.getHealth() / this.getMaxHealth()); -- cgit v1.2.3