Update upstream

This commit is contained in:
Spottedleaf
2019-05-06 17:33:26 -07:00
parent 96b32aa6bc
commit 5a6ef6ed50
23 changed files with 33 additions and 33 deletions

View File

@@ -634,7 +634,7 @@ index f86e6a4c51..85567a7072 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 4de927416b..4c1c914132 100644
index 472e8e852f..df9098955c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -0,0 +0,0 @@