From 5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 14 May 2017 12:00:00 +1000 Subject: Update to Minecraft 1.12-pre2 --- nms-patches/EntityWither.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'nms-patches/EntityWither.patch') diff --git a/nms-patches/EntityWither.patch b/nms-patches/EntityWither.patch index 10c3e64d..909781c9 100644 --- a/nms-patches/EntityWither.patch +++ b/nms-patches/EntityWither.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/server/EntityWither.java +++ b/net/minecraft/server/EntityWither.java -@@ -6,6 +6,12 @@ +@@ -5,6 +5,12 @@ import java.util.List; import javax.annotation.Nullable; @@ -13,9 +13,9 @@ public class EntityWither extends EntityMonster implements IRangedEntity { private static final DataWatcherObject a = DataWatcher.a(EntityWither.class, DataWatcherRegistry.b); -@@ -193,13 +199,38 @@ - if (this.dh() > 0) { - i = this.dh() - 1; +@@ -192,13 +198,38 @@ + if (this.dk() > 0) { + i = this.dk() - 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 { -@@ -290,6 +321,11 @@ +@@ -289,6 +320,11 @@ Block block = iblockdata.getBlock(); if (iblockdata.getMaterial() != Material.AIR && a(block)) { @@ -67,7 +67,7 @@ flag = this.world.setAir(blockposition, true) || flag; } } -@@ -303,7 +339,7 @@ +@@ -302,7 +338,7 @@ } if (this.ticksLived % 20 == 0) { @@ -75,4 +75,4 @@ + this.heal(1.0F, EntityRegainHealthEvent.RegainReason.REGEN); // CraftBukkit } - this.bF.setProgress(this.getHealth() / this.getMaxHealth()); + this.bG.setProgress(this.getHealth() / this.getMaxHealth()); -- cgit v1.2.3