Update to 1.12.1

This commit is contained in:
BlackHole
2017-08-03 16:36:06 +02:00
parent 644f1e6e30
commit 01d1cc351b
64 changed files with 151 additions and 224 deletions

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
to stop IDE complaining about potential NPE
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 5db42bef..41ef9bc2 100644
index f5d284ca3..948a04491 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -0,0 +0,0 @@ import co.aikar.timings.MinecraftTimings; // Paper