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

@@ -7,7 +7,7 @@ Had some issue with this in past, and this is the vanilla logic.
Potentially an old CB change that's no longer needed.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 063750cd5f..f69d544a51 100644
index 97e6aedad7..fd2a21182a 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