Merge branch 'master' into ver/1.14

This commit is contained in:
Shane Freeder
2019-05-27 01:16:47 +01:00
14 changed files with 15 additions and 46 deletions

View File

@@ -81,7 +81,7 @@ index ef882b897f..385b3ac0ce 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 12f0fe618d..5340767049 100644
index 836b012474..c70c84c2a4 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {