From e24569a9ed3e65942c0de667d2f4b66fc9dcec82 Mon Sep 17 00:00:00 2001
From: FearThe1337 <admin@fearthe1337.com>
Date: Tue, 9 Dec 2014 15:40:38 +0100
Subject: SPIGOT-143: Fix various animal stuff not being canceled by
 damageEntity.

Fixes wolves and ocelots standing up when the damag event is being canceled.
Also stops breeding mode reset by the same event.
---
 nms-patches/EntityWolf.patch | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

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

diff --git a/nms-patches/EntityWolf.patch b/nms-patches/EntityWolf.patch
index 45263612..71e05777 100644
--- a/nms-patches/EntityWolf.patch
+++ b/nms-patches/EntityWolf.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/EntityWolf.java	2014-11-28 17:43:43.181707433 +0000
-+++ src/main/java/net/minecraft/server/EntityWolf.java	2014-11-28 17:38:19.000000000 +0000
+--- ../work/decompile-8eb82bde/net/minecraft/server/EntityWolf.java	2014-12-10 18:34:37.316492559 +0000
++++ src/main/java/net/minecraft/server/EntityWolf.java	2014-12-10 18:34:29.104492649 +0000
 @@ -1,5 +1,10 @@
  package net.minecraft.server;
  
@@ -41,7 +41,17 @@
      }
  
      protected String bn() {
-@@ -219,7 +236,7 @@
+@@ -176,7 +193,8 @@
+         } else {
+             Entity entity = damagesource.getEntity();
+ 
+-            this.bk.setSitting(false);
++            // CraftBukkit - moved into EntityLiving.d(DamageSource, float)
++            // this.bk.setSitting(false);
+             if (entity != null && !(entity instanceof EntityHuman) && !(entity instanceof EntityArrow)) {
+                 f = (f + 1.0F) / 2.0F;
+             }
+@@ -219,7 +237,7 @@
                              --itemstack.count;
                          }
  
@@ -50,7 +60,7 @@
                          if (itemstack.count <= 0) {
                              entityhuman.inventory.setItem(entityhuman.inventory.itemInHandIndex, (ItemStack) null);
                          }
-@@ -244,7 +261,7 @@
+@@ -244,7 +262,7 @@
                  this.bk.setSitting(!this.isSitting());
                  this.aW = false;
                  this.navigation.n();
@@ -59,7 +69,7 @@
              }
          } else if (itemstack != null && itemstack.getItem() == Items.BONE && !this.isAngry()) {
              if (!entityhuman.abilities.canInstantlyBuild) {
-@@ -256,12 +273,13 @@
+@@ -256,12 +274,13 @@
              }
  
              if (!this.world.isStatic) {
@@ -76,7 +86,7 @@
                      this.setOwnerUUID(entityhuman.getUniqueID().toString());
                      this.l(true);
                      this.world.broadcastEntityEffect(this, (byte) 7);
-@@ -348,7 +366,7 @@
+@@ -348,7 +367,7 @@
      }
  
      protected boolean isTypeNotPersistent() {
-- 
cgit v1.2.3