Renumber patches, fix conflicts, update for 1.12
This commit is contained in:
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerAttemptPickupItemEvent
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
|
||||
index 95ca1b8e..8820dd32 100644
|
||||
index 6ed3d7906..21a7a3a12 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityItem.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityItem.java
|
||||
@@ -0,0 +0,0 @@ import java.util.Iterator;
|
||||
|
||||
Reference in New Issue
Block a user