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/EntityInsentient.patch | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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

diff --git a/nms-patches/EntityInsentient.patch b/nms-patches/EntityInsentient.patch
index d76af694..f29afe3e 100644
--- a/nms-patches/EntityInsentient.patch
+++ b/nms-patches/EntityInsentient.patch
@@ -88,7 +88,7 @@
          NBTTagList nbttaglist;
          int i;
  
-@@ -521,7 +573,9 @@
+@@ -525,7 +577,9 @@
              }
  
              if (!itemstack1.isEmpty() && (double) (this.random.nextFloat() - 0.1F) < d0) {
@@ -97,8 +97,8 @@
 +                this.forceDrops = false; // CraftBukkit
              }
  
-             if (itemstack.getItem() == Items.DIAMOND && entityitem.n() != null) {
-@@ -569,11 +623,11 @@
+             this.setSlot(enumitemslot, itemstack);
+@@ -565,11 +619,11 @@
                  double d2 = entityhuman.locZ - this.locZ;
                  double d3 = d0 * d0 + d1 * d1 + d2 * d2;
  
@@ -112,7 +112,7 @@
                      this.die();
                  } else if (d3 < 1024.0D) {
                      this.ticksFarFromPlayer = 0;
-@@ -942,12 +996,24 @@
+@@ -938,12 +992,24 @@
  
      public final boolean b(EntityHuman entityhuman, EnumHand enumhand) {
          if (this.isLeashed() && this.getLeashHolder() == entityhuman) {
@@ -137,9 +137,9 @@
                  this.setLeashHolder(entityhuman, true);
                  itemstack.subtract(1);
                  return true;
-@@ -968,10 +1034,12 @@
+@@ -964,10 +1030,12 @@
  
-         if (this.bD) {
+         if (this.bE) {
              if (!this.isAlive()) {
 +                this.world.getServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), UnleashReason.PLAYER_UNLEASH)); // CraftBukkit
                  this.unleash(true, true);
@@ -150,8 +150,8 @@
                  this.unleash(true, true);
              }
          }
-@@ -982,7 +1050,9 @@
-             this.bD = false;
+@@ -978,7 +1046,9 @@
+             this.bE = false;
              this.leashHolder = null;
              if (!this.world.isClientSide && flag1) {
 +                this.forceDrops = true; // CraftBukkit
@@ -160,7 +160,7 @@
              }
  
              if (!this.world.isClientSide && flag && this.world instanceof WorldServer) {
-@@ -1052,6 +1122,7 @@
+@@ -1048,6 +1118,7 @@
  
                  this.setLeashHolder(entityleash, true);
              } else {
-- 
cgit v1.2.3