Renumber patches, fix conflicts, update for 1.12
This commit is contained in:
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
|
||||
index dfba8163..fd97ea21 100644
|
||||
index dfba8163..83ee01f7 100644
|
||||
--- a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
|
||||
@@ -0,0 +0,0 @@ import org.bukkit.event.HandlerList;
|
||||
|
||||
Reference in New Issue
Block a user