Rebuild patches for upstream merge

This commit is contained in:
Aikar
2018-07-21 16:43:00 -04:00
parent 7c13469d6c
commit 1b778924c3
17 changed files with 52 additions and 59 deletions

View File

@@ -27,7 +27,7 @@ index 5df8b1143..0b748d402 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index b47bf9738..db7e37aee 100644
index 4bfc49076..8a04a801b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke