Update upstream

This commit is contained in:
Aikar
2018-07-29 22:16:15 -04:00
parent 430513974f
commit 20bf0ed9ea
18 changed files with 65 additions and 65 deletions

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
UUID, ticks lived, valid, dead
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index efcc215ed3..5a003c8203 100644
index fa9d68bd18..ff15c52f8b 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