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/EntityItem.patch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/nms-patches/EntityItem.patch b/nms-patches/EntityItem.patch
index 4215e019..50faa6a4 100644
--- a/nms-patches/EntityItem.patch
+++ b/nms-patches/EntityItem.patch
@@ -19,7 +19,7 @@
 @@ -54,9 +56,12 @@
              this.die();
          } else {
-             super.A_();
+             super.B_();
 -            if (this.pickupDelay > 0 && this.pickupDelay != 32767) {
 -                --this.pickupDelay;
 -            }
@@ -42,7 +42,7 @@
              }
 +            // Craftbukkit end */
  
-             this.ak();
+             this.aq();
              if (!this.world.isClientSide) {
 @@ -121,6 +128,12 @@
              }
@@ -74,7 +74,7 @@
 +                return false;
 +            }
 +            // CraftBukkit end
-             this.ap();
+             this.av();
              this.f = (int) ((float) this.f - f);
              if (this.f <= 0) {
 @@ -270,6 +289,26 @@
@@ -102,5 +102,5 @@
 +            // CraftBukkit end
 +
              if (this.pickupDelay == 0 && (this.h == null || 6000 - this.age <= 200 || this.h.equals(entityhuman.getName())) && entityhuman.inventory.pickup(itemstack)) {
-                 if (item == Item.getItemOf(Blocks.LOG)) {
-                     entityhuman.b((Statistic) AchievementList.g);
+                 entityhuman.receive(this, i);
+                 if (itemstack.isEmpty()) {
-- 
cgit v1.2.3