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

@@ -15,7 +15,7 @@ Should Mojang choose to alter this behavior in the future, this change
will simply defer to whatever that new behavior is.
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
index b61864641c..d39d49944a 100644
index 3f7190b6a2..844f491c70 100644
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
@@ -0,0 +0,0 @@ public abstract class RegionFileCache implements AutoCloseable {