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

@@ -23,7 +23,7 @@ index d2d4ff6fb..65297a761 100644
public String a() throws Exception {
int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 957e0101e..f29e518c7 100644
index 31b765dea..fd5f8102a 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 {