From a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 9 Jun 2016 11:43:49 +1000
Subject: Update to Minecraft 1.10

---
 nms-patches/EntityWolf.patch | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

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

diff --git a/nms-patches/EntityWolf.patch b/nms-patches/EntityWolf.patch
index c37aeb64..da6feb89 100644
--- a/nms-patches/EntityWolf.patch
+++ b/nms-patches/EntityWolf.patch
@@ -12,7 +12,7 @@
  public class EntityWolf extends EntityTameableAnimal {
  
      private static final DataWatcherObject<Float> DATA_HEALTH = DataWatcher.a(EntityWolf.class, DataWatcherRegistry.c);
-@@ -60,6 +65,22 @@
+@@ -61,6 +66,22 @@
          this.getAttributeMap().b(GenericAttributes.ATTACK_DAMAGE).setValue(2.0D);
      }
  
@@ -35,7 +35,7 @@
      public void setGoalTarget(@Nullable EntityLiving entityliving) {
          super.setGoalTarget(entityliving);
          if (entityliving == null) {
-@@ -194,9 +215,10 @@
+@@ -199,9 +220,10 @@
              Entity entity = damagesource.getEntity();
  
              if (this.goalSit != null) {
@@ -48,7 +48,7 @@
              if (entity != null && !(entity instanceof EntityHuman) && !(entity instanceof EntityArrow)) {
                  f = (f + 1.0F) / 2.0F;
              }
-@@ -237,7 +259,7 @@
+@@ -242,7 +264,7 @@
                              --itemstack.count;
                          }
  
@@ -57,16 +57,16 @@
                          return true;
                      }
                  } else if (itemstack.getItem() == Items.DYE) {
-@@ -258,7 +280,7 @@
+@@ -263,7 +285,7 @@
                  this.goalSit.setSitting(!this.isSitting());
-                 this.bd = false;
+                 this.be = false;
                  this.navigation.o();
 -                this.setGoalTarget((EntityLiving) null);
 +                this.setGoalTarget((EntityLiving) null, TargetReason.FORGOT_TARGET, true); // CraftBukkit - reason
              }
          } else if (itemstack != null && itemstack.getItem() == Items.BONE && !this.isAngry()) {
              if (!entityhuman.abilities.canInstantlyBuild) {
-@@ -266,12 +288,14 @@
+@@ -271,12 +293,14 @@
              }
  
              if (!this.world.isClientSide) {
@@ -80,14 +80,5 @@
                      this.setHealth(20.0F);
 +                    this.setHealth(this.getMaxHealth()); // CraftBukkit - 20.0 -> getMaxHealth()
                      this.setOwnerUUID(entityhuman.getUniqueID());
-                     this.o(true);
+                     this.p(true);
                      this.world.broadcastEntityEffect(this, (byte) 7);
-@@ -353,7 +377,7 @@
-     }
- 
-     protected boolean isTypeNotPersistent() {
--        return !this.isTamed() && this.ticksLived > 2400;
-+        return !this.isTamed() /*&& this.ticksLived > 2400*/; // CraftBukkit
-     }
- 
-     public boolean a(EntityLiving entityliving, EntityLiving entityliving1) {
-- 
cgit v1.2.3