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

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner()
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index f79295052a..034169140b 100644
index a09cf2e3f9..caed668bed 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