SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More compile fixes

Browse Source
This commit is contained in:
Zach Brown
2019-12-12 19:18:18 -06:00
parent 78640d1334
commit f7b5ea39ea
30 changed files with 147 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Spigot-Server-Patches/incremental-chunk-saving.patch
View File

@@ -149,7 +149,7 @@ index 827831aab..4379434f6 100644
if (flag) {
List<PlayerChunk> list = (List) this.visibleChunks.values().stream().filter(PlayerChunk::hasBeenLoaded).peek(PlayerChunk::m).collect(Collectors.toList());
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index c28c0431a..0fd3cb54b 100644
index c28c0431a..4bfa6ea0e 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World {
@@ -166,7 +166,7 @@ index c28c0431a..0fd3cb54b 100644
+
+ try (co.aikar.timings.Timing ignored = timings.worldSave.startTiming()) {
+ if (doFull) {
+ this.k_();
+ this.saveData();
+ }
+
+ timings.worldSaveChunks.startTiming(); // Paper
@@ -180,9 +180,9 @@ index c28c0431a..0fd3cb54b 100644
+ WorldServer worldserver1 = this;
+ WorldData worlddata = worldserver1.getWorldData();
+
+ worldserver1.getWorldBorder().a(worlddata);
+ worlddata.c(this.server.getBossBattleCustomData().c());
+ worldserver1.getDataManager().saveWorldData(worlddata, this.server.getPlayerList().r());
+ worldserver1.getWorldBorder().save(worlddata);
+ worlddata.setCustomBossEvents(this.server.getBossBattleCustomData().save());
+ worldserver1.getDataManager().saveWorldData(worlddata, this.server.getPlayerList().save());
+ // CraftBukkit end
+ }
+ }
@@ -198,4 +198,12 @@ index c28c0431a..0fd3cb54b 100644
try (co.aikar.timings.Timing ignored = timings.worldSave.startTiming()) { // Paper
if (iprogressupdate != null) {
iprogressupdate.a(new ChatMessage("menu.savingLevel", new Object[0]));
@@ -0,0 +0,0 @@ public class WorldServer extends World {
// CraftBukkit end
}
+ protected void saveData() throws ExceptionWorldConflict { this.m_(); } // Paper - OBFHELPER
protected void m_() throws ExceptionWorldConflict {
this.checkSession();
this.worldProvider.i();
--