twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 04:32:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Latest progress - restored patches, some issues resolved

Browse Source
This commit is contained in:
Aikar
2020-06-26 02:29:44 -04:00
parent bc5acdddad
commit fe2a0ea500
34 changed files with 338 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Spigot-Server-Patches/Asynchronous-chunk-IO-and-loading.patch
View File

@@ -140,7 +140,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ public final Timing chunkUnloadDataSave;
+
public WorldTimingsHandler(World server) {
String name = server.worldData.getName() +" - ";
String name = server.getWorld().getName() +" - ";
@@ -0,0 +0,0 @@ public class WorldTimingsHandler {
@@ -341,7 +341,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+package com.destroystokyo.paper.io;
+
+import net.minecraft.server.ChunkCoordIntPair;
+import net.minecraft.server.ExceptionWorldConflict;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.NBTTagCompound;
+import net.minecraft.server.RegionFile;
@@ -882,15 +881,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ }
+
+ // check if another process is writing
+ try {
+ this.world.checkSession();
+ } catch (final ExceptionWorldConflict ex) {
+ /*try { TODO: Can we restore this?
+ ((WorldServer)this.world).checkSession();
+ } catch (final Exception ex) {
+ LOGGER.fatal("Couldn't save chunk; already in use by another instance of Minecraft?", ex);
+ // we don't need to set the write counter to -1 as we know at this stage there's no point in re-scheduling
+ // writes since they'll fail anyways.
+ return;
+ }
+
+*/
+ for (;;) {
+ final long writeCounter;
+ final NBTTagCompound data;