Upstream/WorldBorder-Updated-Fork
1
0
Fork 0
mirror of https://github.com/PryPurity/WorldBorder.git synced 2024-06-24 10:05:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Testing commented out Async PaperLib.

Browse Source
This commit is contained in:
PryPurity 2020-07-04 14:28:08 -05:00
parent 14fbac1951
commit c1969b3f7a
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/wimbli/WorldBorder/WorldFillTask.java
View File

@ -2,9 +2,7 @@ package com.wimbli.WorldBorder;
import com.wimbli.WorldBorder.Events.WorldBorderFillFinishedEvent;
import com.wimbli.WorldBorder.Events.WorldBorderFillStartEvent;
import io.papermc.lib.PaperLib;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.entity.Player;
@ -253,18 +251,18 @@ public class WorldFillTask implements Runnable {
}
}
pendingChunks.put(getPaperLibChunk(world, x, z, true), new CoordXZ(x, z));
// pendingChunks.put(getPaperLibChunk(world, x, z, true), new CoordXZ(x, z));
// There need to be enough nearby chunks loaded to make the server populate a chunk with trees, snow, etc.
// So, we keep the last few chunks loaded, and need to also temporarily load an extra inside chunk (neighbor closest to center of map)
int popX = !isZLeg ? x : (x + (isNeg ? -1 : 1));
int popZ = isZLeg ? z : (z + (!isNeg ? -1 : 1));
pendingChunks.put(getPaperLibChunk(world, popX, popZ, false), new CoordXZ(popX, popZ));
// pendingChunks.put(getPaperLibChunk(world, popX, popZ, false), new CoordXZ(popX, popZ));
preventUnload.add(new UnloadDependency(popX, popZ, x, z));
// make sure the previous chunk in our spiral is loaded as well (might have already existed and been skipped over)
pendingChunks.put(getPaperLibChunk(world, lastChunk.x, lastChunk.z, false), new CoordXZ(lastChunk.x, lastChunk.z)); // <-- new CoordXZ as lastChunk isn't immutable
//pendingChunks.put(getPaperLibChunk(world, lastChunk.x, lastChunk.z, false), new CoordXZ(lastChunk.x, lastChunk.z)); // <-- new CoordXZ as lastChunk isn't immutable
preventUnload.add(new UnloadDependency(lastChunk.x, lastChunk.z, x, z));
// move on to next chunk
@ -534,16 +532,16 @@ public class WorldFillTask implements Runnable {
return reportTarget;
}
private CompletableFuture<Void> getPaperLibChunk(World world, int x, int z, boolean gen) {
return PaperLib.getChunkAtAsync(world, x, z, gen).thenAccept((Chunk chunk) ->
{
if (chunk != null) {
// toggle "force loaded" flag on for chunk to prevent it from being unloaded while we need it
world.setChunkForceLoaded(x, z, true);
//private CompletableFuture<Void> getPaperLibChunk(World world, int x, int z, boolean gen) {
// return PaperLib.getChunkAtAsync(world, x, z, gen).thenAccept((Chunk chunk) ->
// {
// if (chunk != null) {
// // toggle "force loaded" flag on for chunk to prevent it from being unloaded while we need it
// world.setChunkForceLoaded(x, z, true);
//
}
});
}
// }
// });
//}
private class UnloadDependency {
int neededX, neededZ;