Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
2b4ce0b37 Restore incremental player saving
This commit is contained in:
William Blake Galbreath
2020-08-16 10:00:17 -05:00
parent 9a376d0423
commit e1abdd5ab5
12 changed files with 42 additions and 42 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 bb54a4aa71..0a7dd67516 100644
index 0d29d88c2b..6aaf6dbced 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1506,7 +1506,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1512,7 +1512,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {