From 2359f6fcb0190f8f4310e6174812df51743c2057 Mon Sep 17 00:00:00 2001
From: Morphan1 <morphanone@gmail.com>
Date: Fri, 26 Jun 2015 05:55:33 -0400
Subject: Implement ItemMergeEvent

---
 nms-patches/EntityItem.patch | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

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

diff --git a/nms-patches/EntityItem.patch b/nms-patches/EntityItem.patch
index bcc5bdca..dc984456 100644
--- a/nms-patches/EntityItem.patch
+++ b/nms-patches/EntityItem.patch
@@ -66,7 +66,15 @@
                  this.die();
              }
  
-@@ -183,6 +202,11 @@
+@@ -137,6 +156,7 @@
+                     } else if (itemstack1.count + itemstack.count > itemstack1.getMaxStackSize()) {
+                         return false;
+                     } else {
++                        if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemMergeEvent(this, entityitem).isCancelled()) return false; // CraftBukkit
+                         itemstack1.count += itemstack.count;
+                         entityitem.pickupDelay = Math.max(entityitem.pickupDelay, this.pickupDelay);
+                         entityitem.age = Math.min(entityitem.age, this.age);
+@@ -183,6 +203,11 @@
          } else if (this.getItemStack() != null && this.getItemStack().getItem() == Items.NETHER_STAR && damagesource.isExplosion()) {
              return false;
          } else {
@@ -78,7 +86,7 @@
              this.ac();
              this.e = (int) ((float) this.e - f);
              if (this.e <= 0) {
-@@ -228,7 +252,18 @@
+@@ -228,7 +253,18 @@
  
          NBTTagCompound nbttagcompound1 = nbttagcompound.getCompound("Item");
  
@@ -98,7 +106,7 @@
          if (this.getItemStack() == null) {
              this.die();
          }
-@@ -240,6 +275,26 @@
+@@ -240,6 +276,26 @@
              ItemStack itemstack = this.getItemStack();
              int i = itemstack.count;
  
-- 
cgit v1.2.3