From d8a9c7be4227b2243968b63ab7cc7a00098c93ad Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 26 Feb 2015 22:41:06 +0000 Subject: Update to Minecraft 1.8.3 --- nms-patches/EntityAgeable.patch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'nms-patches/EntityAgeable.patch') diff --git a/nms-patches/EntityAgeable.patch b/nms-patches/EntityAgeable.patch index 4abc0cf7..85cc5dbc 100644 --- a/nms-patches/EntityAgeable.patch +++ b/nms-patches/EntityAgeable.patch @@ -1,9 +1,9 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/EntityAgeable.java Thu Dec 4 19:00:43 2014 -+++ src/main/java/net/minecraft/server/EntityAgeable.java Thu Dec 4 18:45:16 2014 +--- /home/matt/mc-dev-private//net/minecraft/server/EntityAgeable.java 2015-02-26 22:40:22.467608141 +0000 ++++ src/main/java/net/minecraft/server/EntityAgeable.java 2015-02-26 22:40:22.467608141 +0000 @@ -7,6 +7,7 @@ protected int c; - private float bk = -1.0F; - private float bl; + private float bm = -1.0F; + private float bn; + public boolean ageLocked = false; // CraftBukkit public EntityAgeable(World world) { @@ -41,8 +41,8 @@ public void m() { super.m(); -- if (this.world.isStatic) { -+ if (this.world.isStatic || ageLocked) { // CraftBukkit +- if (this.world.isClientSide) { ++ if (this.world.isClientSide || ageLocked) { // CraftBukkit if (this.c > 0) { if (this.c % 4 == 0) { this.world.addParticle(EnumParticle.VILLAGER_HAPPY, this.locX + (double) (this.random.nextFloat() * this.width * 2.0F) - (double) this.width, this.locY + 0.5D + (double) (this.random.nextFloat() * this.length), this.locZ + (double) (this.random.nextFloat() * this.width * 2.0F) - (double) this.width, 0.0D, 0.0D, 0.0D, new int[0]); @@ -50,8 +50,8 @@ this.a(flag ? 0.5F : 1.0F); } -- protected final void a(float f, float f1) { -+ public final void a(float f, float f1) { // CraftBukkit - protected to public - boolean flag = this.bk > 0.0F; +- protected final void setSize(float f, float f1) { ++ public final void setSize(float f, float f1) { // CraftBukkit - protected to public + boolean flag = this.bm > 0.0F; - this.bk = f; + this.bm = f; -- cgit v1.2.3