Renumber patches, fix conflicts, update for 1.12
This commit is contained in:
@@ -5,7 +5,7 @@ Subject: [PATCH] EntityPickupItemEvent
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
index 1d26555d..8cc55734 100644
|
||||
index a7bee79b8..a93c00014 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
@@ -0,0 +0,0 @@ import java.util.UUID;
|
||||
|
||||
Reference in New Issue
Block a user