Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
bfc807c2 Improve spawn loading and debug output for waiting on a chunk (#2595)
826b4762 Remove debug logging for incremental saves (#2600)
d39916c7 Add more timings to chunk provider tick (#2549)
43ec79a3 Add server oversleep to timings (#2509)
1d2a5915 Check if there are workers before trying to notify them (#2593)
89eb8902 [CI-SKIP] Rebuild patches
27fca92f Drop Optimize-GameRules-to-use-LinkedHashMap (#2594)
e4e80f8a Updated Upstream (Bukkit)
This commit is contained in:
William Blake Galbreath
2019-09-29 21:28:06 -05:00
parent e79c63379f
commit e50cb1d799
5 changed files with 12 additions and 12 deletions

View File

@@ -1,4 +1,4 @@
From b67fd8714bdfb391a5b0c90e7d09e8526dd4e7b3 Mon Sep 17 00:00:00 2001
From d9b6e8c71036723ae8f148ad610c8196df7ee36c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:02:11 -0500
Subject: [PATCH] Rebrand
@@ -86,10 +86,10 @@ index cd6e25923..bb227bc0f 100644
);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d2c029973..dcb783407 100644
index 0b0058138..1b6a9623c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1439,7 +1439,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1462,7 +1462,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {