Renumber patches, fix conflicts, update for 1.12

Spigot-API-Patches/0055-PlayerAttemptPickupItemEvent.patch

@@ -0,0 +1,51 @@
+From 22f105de2d79c874e1c620563073bbda1a78c97a Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <Blake.Galbreath@GMail.com>
+Date: Sun, 11 Jun 2017 16:30:37 -0500
+Subject: [PATCH] PlayerAttemptPickupItemEvent
+
+
+diff --git a/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java
+new file mode 100644
+index 00000000..2f5fdb13
+--- /dev/null
++++ b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java
+@@ -0,0 +1,36 @@
++package org.bukkit.event.player;
++
++import org.bukkit.entity.Item;
++import org.bukkit.entity.Player;
++import org.bukkit.event.HandlerList;
++
++/**
++ * Thrown when a player attempts to pick an item up from the ground
++ */
++public class PlayerAttemptPickupItemEvent extends PlayerEvent {
++    private static final HandlerList handlers = new HandlerList();
++    private final Item item;
++
++    public PlayerAttemptPickupItemEvent(final Player player, final Item item) {
++        super(player);
++        this.item = item;
++    }
++
++    /**
++     * Gets the Item attempted by the player.
++     *
++     * @return Item
++     */
++    public Item getItem() {
++        return item;
++    }
++
++    @Override
++    public HandlerList getHandlers() {
++        return handlers;
++    }
++
++    public static HandlerList getHandlerList() {
++        return handlers;
++    }
++}
+-- 
+2.13.1
+