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

@@ -39,7 +39,7 @@ index 4e8ce79ff..2300ee10b 100644
if (i1 - j > 1000L) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f7987bb7b..641a1d7dd 100644
index 77791ffeb..71907eb56 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 {