From 9a072ddc1f181a1eef3b1a5d306af21756f8211b Mon Sep 17 00:00:00 2001 From: 2008Choco Date: Tue, 22 Mar 2016 14:03:48 -0400 Subject: SPIGOT-1733: Add PlayerPickupArrowEvent --- nms-patches/EntityArrow.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nms-patches') diff --git a/nms-patches/EntityArrow.patch b/nms-patches/EntityArrow.patch index cfda50e8..f00b6b7f 100644 --- a/nms-patches/EntityArrow.patch +++ b/nms-patches/EntityArrow.patch @@ -7,7 +7,7 @@ +// CraftBukkit start +import org.bukkit.entity.LivingEntity; +import org.bukkit.event.entity.EntityCombustByEntityEvent; -+import org.bukkit.event.player.PlayerPickupItemEvent; ++import org.bukkit.event.player.PlayerPickupArrowEvent; +// CraftBukkit end + public abstract class EntityArrow extends Entity implements IProjectile { @@ -60,7 +60,7 @@ + if (this.fromPlayer == PickupStatus.ALLOWED && entityhuman.inventory.canHold(itemstack) > 0) { + EntityItem item = new EntityItem(this.world, this.locX, this.locY, this.locZ, itemstack); + -+ PlayerPickupItemEvent event = new PlayerPickupItemEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), new org.bukkit.craftbukkit.entity.CraftItem(this.world.getServer(), this, item), 0); ++ PlayerPickupArrowEvent event = new PlayerPickupArrowEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), new org.bukkit.craftbukkit.entity.CraftItem(this.world.getServer(), this, item), (org.bukkit.entity.Arrow) this.getBukkitEntity()); + // event.setCancelled(!entityhuman.canPickUpLoot); TODO + this.world.getServer().getPluginManager().callEvent(event); + -- cgit v1.2.3