diff options
author | md_5 <git@md-5.net> | 2016-11-17 12:41:03 +1100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-11-17 12:41:03 +1100 |
commit | c25ddf063a808e3adb749e22017661f403c5fb7e (patch) | |
tree | b2efcff512be12fd3e38cf8c36386148ce6ab4ae /nms-patches/EntityAgeable.patch | |
parent | 51263e97187a84338f89698eef187284055a682a (diff) | |
download | craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar.gz craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar.lz craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar.xz craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.zip |
Update to Minecraft 1.11
Diffstat (limited to 'nms-patches/EntityAgeable.patch')
-rw-r--r-- | nms-patches/EntityAgeable.patch | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/nms-patches/EntityAgeable.patch b/nms-patches/EntityAgeable.patch index 5a95ae6b..5982edfc 100644 --- a/nms-patches/EntityAgeable.patch +++ b/nms-patches/EntityAgeable.patch @@ -2,13 +2,13 @@ +++ b/net/minecraft/server/EntityAgeable.java @@ -10,6 +10,7 @@ protected int c; - private float by = -1.0F; - private float bz; + private float bx = -1.0F; + private float by; + public boolean ageLocked; // CraftBukkit public EntityAgeable(World world) { super(world); -@@ -28,13 +29,18 @@ +@@ -31,7 +32,7 @@ if (entityageable != null) { entityageable.setAgeRaw(-24000); entityageable.setPositionRotation(this.locX, this.locY, this.locZ, 0.0F, 0.0F); @@ -17,18 +17,7 @@ if (itemstack.hasName()) { entityageable.setCustomName(itemstack.getName()); } - - if (!entityhuman.abilities.canInstantlyBuild) { - --itemstack.count; -+ // CraftBukkit start - allow less than 0 stacks as "infinite" -+ if (itemstack.count == 0) { -+ entityhuman.inventory.setItem(entityhuman.inventory.itemInHandIndex, (ItemStack) null); -+ } -+ // CraftBukkit end - } - } - } -@@ -97,12 +103,14 @@ +@@ -110,12 +111,14 @@ super.b(nbttagcompound); nbttagcompound.setInt("Age", this.getAge()); nbttagcompound.setInt("ForcedAge", this.b); @@ -43,7 +32,7 @@ } public void a(DataWatcherObject<?> datawatcherobject) { -@@ -115,7 +123,7 @@ +@@ -128,7 +131,7 @@ public void n() { super.n(); |