Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
90264712a [Auto] Updated Upstream (Bukkit)
960d992fd Further improve Chunk Light Prioritization
0d19e4579 Fix deadlock issue with watchdog stopping
baf1fabe9 Updated Upstream (CraftBukkit)
c0547a6cb [CI-SKIP] Revitalise CONTRIBUTING.md
This commit is contained in:
William Blake Galbreath
2020-07-29 07:43:30 -05:00
parent fe05292d11
commit 0a4aaf4966
8 changed files with 30 additions and 30 deletions

View File

@@ -99,10 +99,10 @@ index 74ed02fa92..c1280478ee 100644
.completer(new ConsoleCommandCompleter(this.server))
);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0200f21cbe..56020d44b7 100644
index bb54a4aa71..0a7dd67516 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1505,7 +1505,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1506,7 +1506,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {