From 34597b2009879d82d2178dab94ac7719e8be9887 Mon Sep 17 00:00:00 2001 From: Fabrizio La Rosa Date: Tue, 23 Jun 2020 18:39:35 +0200 Subject: [PATCH] ChunkPerTick config option --- .../songoda/skyblock/blockscanner/ChunkLoader.java | 13 +++++++++++-- src/main/resources/config.yml | 4 ++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/songoda/skyblock/blockscanner/ChunkLoader.java b/src/main/java/com/songoda/skyblock/blockscanner/ChunkLoader.java index 1e15191c..2734e2c0 100644 --- a/src/main/java/com/songoda/skyblock/blockscanner/ChunkLoader.java +++ b/src/main/java/com/songoda/skyblock/blockscanner/ChunkLoader.java @@ -5,12 +5,12 @@ import com.songoda.skyblock.SkyBlock; import com.songoda.skyblock.island.Island; import com.songoda.skyblock.island.IslandEnvironment; import com.songoda.skyblock.island.IslandWorld; -import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.scheduler.BukkitRunnable; +import java.io.File; import java.util.LinkedList; import java.util.List; import java.util.concurrent.CompletableFuture; @@ -29,8 +29,13 @@ public class ChunkLoader extends BukkitRunnable { private int minZ; private int maxX; private int maxZ; + private int chunkPerTick; private ChunkLoader(Island island, IslandWorld islandWorld, boolean paper, boolean chunkForChunk, ChunkForChunkScannerTask chunkTask) { + chunkPerTick = SkyBlock.getInstance().getFileManager() + .getConfig(new File(SkyBlock.getInstance().getDataFolder(), "config.yml")) + .getFileConfiguration().getInt("Island.Performance.ChunkPerTick", 25); + this.chunkTask = chunkTask; this.chunkForChunk = chunkForChunk; this.paper = paper; @@ -60,6 +65,10 @@ public class ChunkLoader extends BukkitRunnable { } private ChunkLoader(Island island, IslandWorld islandWorld, boolean paper, boolean chunkForChunk, ChunkScannerTask generalTask) { + chunkPerTick = SkyBlock.getInstance().getFileManager() + .getConfig(new File(SkyBlock.getInstance().getDataFolder(), "config.yml")) + .getFileConfiguration().getInt("Island.Performance.ChunkPerTick", 25); + this.generalTask = generalTask; this.chunkForChunk = chunkForChunk; this.paper = paper; @@ -90,7 +99,7 @@ public class ChunkLoader extends BukkitRunnable { @Override public void run() { - for(int i = 0; i < 50 || paper; i++){ // TODO Config for chunk per tick + for(int i = 0; i < chunkPerTick || paper; i++){ if(x < maxX){ if(z < maxZ){ if(!chunkForChunk){ diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 60818c68..c0d664f9 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -9,6 +9,10 @@ Sound: # When disabled all sounds will be disabled. Enable: true Island: + Performance: + # Chunk loading per tick affecting operations like island deletion, scan and biome changing. + # This option is ignored when using Paper's async chunk load + ChunkPerTick: 25 Size: # [!] Do not go over 1000 for both of these options. # The size of an Island when created.