From 4602331b1dfe3699e054bcde8b8bd5670eb1046b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 18 Dec 2016 09:26:36 +1100
Subject: SPIGOT-2930: Shift calling of PlayerItemBreakEvent to before break.

---
 nms-patches/ItemStack.patch | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/nms-patches/ItemStack.patch b/nms-patches/ItemStack.patch
index 10ffe646..6e539e71 100644
--- a/nms-patches/ItemStack.patch
+++ b/nms-patches/ItemStack.patch
@@ -264,18 +264,18 @@
      }
  
      public int k() {
-@@ -205,6 +392,11 @@
-                         entityhuman.b(StatisticList.c(this.item));
-                     }
- 
+@@ -198,6 +385,11 @@
+             if (this.f()) {
+                 if (this.isDamaged(i, entityliving.getRandom())) {
+                     entityliving.b(this);
 +                    // CraftBukkit start - Check for item breaking
-+                    if (this.count == 0 && entityliving instanceof EntityHuman) {
++                    if (this.count == 1 && entityliving instanceof EntityHuman) {
 +                        org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((EntityHuman) entityliving, this);
 +                    }
 +                    // CraftBukkit end
-                     this.damage = 0;
-                 }
- 
+                     this.subtract(1);
+                     if (entityliving instanceof EntityHuman) {
+                         EntityHuman entityhuman = (EntityHuman) entityliving;
 @@ -509,6 +701,12 @@
          nbttaglist.add(nbttagcompound);
      }
-- 
cgit v1.2.3