From aa008dff0f9bedbe88e1fe79831776b0a52eb90a Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 1 Mar 2016 08:32:46 +1100 Subject: Update to Minecraft 1.9 --- nms-patches/EntityOcelot.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'nms-patches/EntityOcelot.patch') diff --git a/nms-patches/EntityOcelot.patch b/nms-patches/EntityOcelot.patch index 6f1a161d..1ce5a151 100644 --- a/nms-patches/EntityOcelot.patch +++ b/nms-patches/EntityOcelot.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/server/EntityOcelot.java +++ b/net/minecraft/server/EntityOcelot.java -@@ -51,7 +51,7 @@ +@@ -54,7 +54,7 @@ } protected boolean isTypeNotPersistent() { @@ -9,7 +9,7 @@ } protected void initAttributes() { -@@ -96,6 +96,9 @@ +@@ -95,6 +95,9 @@ return entity.damageEntity(DamageSource.mobAttack(this), 3.0F); } @@ -19,15 +19,15 @@ public boolean damageEntity(DamageSource damagesource, float f) { if (this.isInvulnerable(damagesource)) { return false; -@@ -104,6 +107,7 @@ +@@ -106,6 +109,7 @@ return super.damageEntity(damagesource, f); } } + // CraftBukkit end */ - protected void dropDeathLoot(boolean flag, int i) {} - -@@ -124,7 +128,8 @@ + protected MinecraftKey J() { + return LootTables.J; +@@ -122,7 +126,8 @@ } if (!this.world.isClientSide) { @@ -36,8 +36,8 @@ + if (this.random.nextInt(3) == 0 && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this, entityhuman).isCancelled()) { this.setTamed(true); this.setCatType(1 + this.world.random.nextInt(3)); - this.setOwnerUUID(entityhuman.getUniqueID().toString()); -@@ -231,7 +236,7 @@ + this.setOwnerUUID(entityhuman.getUniqueID()); +@@ -230,7 +235,7 @@ entityocelot.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F); entityocelot.setAgeRaw(-24000); -- cgit v1.2.3