Renumber patches, fix conflicts, update for 1.12

2017-06-11 20:02:57 -05:00
parent a86bd09bb7
commit cd7f5199e8
7 changed files with 11 additions and 11 deletions
--- a/Spigot-API-Patches/EntityPickupItemEvent.patch
+++ b/Spigot-API-Patches/EntityPickupItemEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityPickupItemEvent

 diff --git a/src/main/java/org/bukkit/event/entity/EntityPickupItemEvent.java b/src/main/java/org/bukkit/event/entity/EntityPickupItemEvent.java
 new file mode 100644
-index 00000000..f485f313
+index 00000000..3d40b515
 --- /dev/null
 +++ b/src/main/java/org/bukkit/event/entity/EntityPickupItemEvent.java
@@ -0,0 +0,0 @@