From d8a9c7be4227b2243968b63ab7cc7a00098c93ad Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Thu, 26 Feb 2015 22:41:06 +0000
Subject: Update to Minecraft 1.8.3

---
 nms-patches/EntityOcelot.patch | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'nms-patches/EntityOcelot.patch')

diff --git a/nms-patches/EntityOcelot.patch b/nms-patches/EntityOcelot.patch
index 0ec9bbaa..00c97fdb 100644
--- a/nms-patches/EntityOcelot.patch
+++ b/nms-patches/EntityOcelot.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde/net/minecraft/server/EntityOcelot.java	2014-12-10 18:34:37.228492560 +0000
-+++ src/main/java/net/minecraft/server/EntityOcelot.java	2014-12-10 18:33:29.824493292 +0000
+--- /home/matt/mc-dev-private//net/minecraft/server/EntityOcelot.java	2015-02-26 22:40:22.643608139 +0000
++++ src/main/java/net/minecraft/server/EntityOcelot.java	2015-02-26 22:40:22.643608139 +0000
 @@ -51,7 +51,7 @@
      }
  
@@ -8,23 +8,18 @@
 +        return !this.isTamed() /*&& this.ticksLived > 2400*/; // CraftBukkit
      }
  
-     protected void aW() {
-@@ -95,15 +95,20 @@
-     public boolean r(Entity entity) {
+     protected void initAttributes() {
+@@ -96,6 +96,9 @@
          return entity.damageEntity(DamageSource.mobAttack(this), 3.0F);
      }
--
-+    
+ 
 +    /* CraftBukkit start
 +    // Function disabled as it has no special function anymore after
 +    //   setSitting is disabled.
      public boolean damageEntity(DamageSource damagesource, float f) {
          if (this.isInvulnerable(damagesource)) {
              return false;
-         } else {
--            this.bk.setSitting(false);
-+            // CraftBukkit - moved into EntityLiving.d(DamageSource, float)
-+            // this.bk.setSitting(false);
+@@ -104,6 +107,7 @@
              return super.damageEntity(damagesource, f);
          }
      }
@@ -32,17 +27,17 @@
  
      protected void dropDeathLoot(boolean flag, int i) {}
  
-@@ -124,7 +129,8 @@
+@@ -124,7 +128,8 @@
              }
  
-             if (!this.world.isStatic) {
+             if (!this.world.isClientSide) {
 -                if (this.random.nextInt(3) == 0) {
 +                // CraftBukkit - added event call and isCancelled check
 +                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 +237,7 @@
+@@ -231,7 +236,7 @@
  
                  entityocelot.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
                  entityocelot.setAgeRaw(-24000);
-- 
cgit v1.2.3