mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-01 12:42:05 -07:00
Renumber patches, fix conflicts, update for 1.12
This commit is contained in:
@@ -5,7 +5,7 @@ Subject: [PATCH] Item#canEntityPickup
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
|
||||
index 90260b7e..7163f8b0 100644
|
||||
index 90260b7e..2e98e4f9 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Item.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Item.java
|
||||
@@ -0,0 +0,0 @@ public interface Item extends Entity {
|
||||
|
Reference in New Issue
Block a user