From 5195487ec6c01a80e3a2fca8c4acfc6b9524fcf5 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 14 May 2017 12:00:00 +1000
Subject: Update to Minecraft 1.12-pre2

---
 nms-patches/EntityAnimal.patch | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

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

diff --git a/nms-patches/EntityAnimal.patch b/nms-patches/EntityAnimal.patch
index 4661fecc..80469e67 100644
--- a/nms-patches/EntityAnimal.patch
+++ b/nms-patches/EntityAnimal.patch
@@ -1,14 +1,14 @@
 --- a/net/minecraft/server/EntityAnimal.java
 +++ b/net/minecraft/server/EntityAnimal.java
-@@ -5,6 +5,7 @@
-     protected Block bz;
-     private int bw;
-     private EntityHuman bx;
+@@ -8,6 +8,7 @@
+     protected Block bA;
+     private int bx;
+     private UUID by;
 +    public ItemStack breedItem; // CraftBukkit - Add breedItem variable
  
      public EntityAnimal(World world) {
          super(world);
-@@ -38,6 +39,9 @@
+@@ -41,6 +42,9 @@
  
      }
  
@@ -18,19 +18,19 @@
      public boolean damageEntity(DamageSource damagesource, float f) {
          if (this.isInvulnerable(damagesource)) {
              return false;
-@@ -46,6 +50,7 @@
+@@ -49,6 +53,7 @@
              return super.damageEntity(damagesource, f);
          }
      }
 +    // CraftBukkit end */
  
      public float a(BlockPosition blockposition) {
-         return this.world.getType(blockposition.down()).getBlock() == this.bz ? 10.0F : this.world.n(blockposition) - 0.5F;
-@@ -120,6 +125,7 @@
-     public void c(EntityHuman entityhuman) {
-         this.bw = 600;
-         this.bx = entityhuman;
+         return this.world.getType(blockposition.down()).getBlock() == this.bA ? 10.0F : this.world.n(blockposition) - 0.5F;
+@@ -130,6 +135,7 @@
+         if (entityhuman != null) {
+             this.by = entityhuman.getUniqueID();
+         }
 +        this.breedItem = entityhuman.inventory.getItemInHand(); // CraftBukkit
+ 
          this.world.broadcastEntityEffect(this, (byte) 18);
      }
- 
-- 
cgit v1.2.3