Upstream
/
Level
mirror of https://github.com/BentoBoxWorld/Level.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not take chunk snapshot async.

This commit is contained in:
tastybento 2020-07-18 21:10:10 -07:00
parent 3cc887b6d3
commit ee4c6ef02c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/world/bentobox/level/calculators/IslandLevelCalculator.java
View File

@ -356,11 +356,9 @@ public class IslandLevelCalculator {
/** /**
* Count the blocks on the island * Count the blocks on the island
* @param result - the CompletableFuture that should be completed when this scan is done * @param result - the CompletableFuture that should be completed when this scan is done
* @param chunk - the chunk to scan * @param chunkSnapshot - the chunk to scan
*/ */
private void scanAsync(CompletableFuture<Boolean> result, Chunk chunk) { private void scanAsync(CompletableFuture<Boolean> result, ChunkSnapshot chunkSnapshot, Chunk chunk) {
// Get a thread-safe snapshot of the chunk
ChunkSnapshot chunkSnapshot = chunk.getChunkSnapshot();
for (int x = 0; x< 16; x++) { for (int x = 0; x< 16; x++) {
// Check if the block coordinate is inside the protection zone and if not, don't count it // Check if the block coordinate is inside the protection zone and if not, don't count it
if (chunkSnapshot.getX() * 16 + x < island.getMinProtectedX() || chunkSnapshot.getX() * 16 + x >= island.getMinProtectedX() + island.getProtectionRange() * 2) { if (chunkSnapshot.getX() * 16 + x < island.getMinProtectedX() || chunkSnapshot.getX() * 16 + x >= island.getMinProtectedX() + island.getProtectionRange() * 2) {
@ -442,7 +440,8 @@ public class IslandLevelCalculator {
} }
// Count blocks in chunk // Count blocks in chunk
CompletableFuture<Boolean> result = new CompletableFuture<>(); CompletableFuture<Boolean> result = new CompletableFuture<>();
Bukkit.getScheduler().runTaskAsynchronously(BentoBox.getInstance(), () -> scanAsync(result, chunk)); ChunkSnapshot snapshot = chunk.getChunkSnapshot();
Bukkit.getScheduler().runTaskAsynchronously(BentoBox.getInstance(), () -> scanAsync(result, snapshot, chunk));
return result; return result;
} }