Update upstream

This commit is contained in:
Aikar
2017-12-09 12:37:09 -05:00
parent fd25094445
commit 0ef74cf264
22 changed files with 33 additions and 33 deletions

View File

@@ -57,7 +57,7 @@ index a599a043d..1c7c187c7 100644
j = MathHelper.floor(entityhuman.locZ / 16.0D);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index eb27d080c..a35f714eb 100644
index 759964b0f..26d4bd690 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {