Merge branch 'master' into pre/1.13

This commit is contained in:
Shane Freeder
2018-07-19 20:23:18 +01:00
6 changed files with 131 additions and 108 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Load version history at server start
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 7ff2fa535..a329887ce 100644
index 927cbeedcd..ae7a8c1046 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer