From c2aec55dceec71f1c37f97ba0d0683a1e29db61e Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 24 May 2019 11:20:43 +0100 Subject: [PATCH] remove old patch from removed --- ...le-Keep-Spawn-Loaded-range-per-world.patch | 111 ------------------ 1 file changed, 111 deletions(-) delete mode 100644 removed/1.14/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch diff --git a/removed/1.14/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/removed/1.14/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch deleted file mode 100644 index 368464af8..000000000 --- a/removed/1.14/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ /dev/null @@ -1,111 +0,0 @@ -From a56f7a9e0398151c9e09484f4b932f748bb637b0 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Sat, 13 Sep 2014 23:14:43 -0400 -Subject: [PATCH] Configurable Keep Spawn Loaded range per world - -This lets you disable it for some worlds and lower it for others. - -diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 6b74f810a9..260c55016e 100644 ---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -258,4 +258,10 @@ public class PaperWorldConfig { - grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate)); - log("Grass Spread Tick Rate: " + grassUpdateRate); - } -+ -+ public short keepLoadedRange; -+ private void keepLoadedRange() { -+ keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 8)) * 16); -+ log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16)); -+ } - } -diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ee45d3705b..01c5d3c572 100644 ---- a/src/main/java/net/minecraft/server/MinecraftServer.java -+++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -486,13 +486,21 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati - List list = Lists.newArrayList(); - Set set = Sets.newConcurrentHashSet(); - -- for (int i = -192; i <= 192 && this.isRunning(); i += 16) { -- for (int j = -192; j <= 192 && this.isRunning(); j += 16) { -+ // Paper start -+ short radius = worldserver.paperConfig.keepLoadedRange; -+ for (int i = -radius; i <= radius && this.isRunning(); i += 16) { -+ for (int j = -radius; j <= radius && this.isRunning(); j += 16) { -+ // Paper end - list.add(new ChunkCoordIntPair(blockposition.getX() + i >> 4, blockposition.getZ() + j >> 4)); - } -+ } // Paper -+ if (this.isRunning()) { // Paper -+ int expected = list.size(); // Paper -+ - - CompletableFuture completablefuture = worldserver.getChunkProvider().a((Iterable) list, (chunk) -> { - set.add(chunk.getPos()); -+ if (set.size() < expected && set.size() % 25 == 0) this.a(new ChatMessage("menu.preparingSpawn", new Object[0]), set.size() * 100 / expected); // Paper - }); - - while (!completablefuture.isDone()) { -@@ -507,11 +515,11 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati - - throw new RuntimeException(executionexception.getCause()); - } catch (TimeoutException timeoutexception) { -- this.a(new ChatMessage("menu.preparingSpawn", new Object[0]), set.size() * 100 / 625); -+ this.a(new ChatMessage("menu.preparingSpawn", new Object[0]), set.size() * 100 / expected); // Paper - } - } - -- this.a(new ChatMessage("menu.preparingSpawn", new Object[0]), set.size() * 100 / 625); -+ this.a(new ChatMessage("menu.preparingSpawn", new Object[0]), set.size() * 100 / expected); // Paper - } - } - -diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 34b5ca3a7e..8a445a1fa3 100644 ---- a/src/main/java/net/minecraft/server/World.java -+++ b/src/main/java/net/minecraft/server/World.java -@@ -2853,8 +2853,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc - int k = i * 16 + 8 - blockposition.getX(); - int l = j * 16 + 8 - blockposition.getZ(); - boolean flag = true; -+ short keepLoadedRange = paperConfig.keepLoadedRange; // Paper - -- return k >= -128 && k <= 128 && l >= -128 && l <= 128 && this.keepSpawnInMemory; // CraftBukkit - Added 'this.keepSpawnInMemory' -+ return k >= -keepLoadedRange && k <= keepLoadedRange && l >= -keepLoadedRange && l <= keepLoadedRange && this.keepSpawnInMemory; // CraftBukkit - Added 'this.keepSpawnInMemory' // Paper - Re-add range var - } - - public LongSet ag() { -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 5e821b84d6..b0ae0365e0 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1007,7 +1007,7 @@ public final class CraftServer implements Server { - System.out.println("Preparing start region for level " + (console.worldServer.size() - 1) + " (Seed: " + internal.getSeed() + ")"); - - if (internal.getWorld().getKeepSpawnInMemory()) { -- short short1 = 196; -+ short short1 = internal.paperConfig.keepLoadedRange; // Paper - long i = System.currentTimeMillis(); - for (int j = -short1; j <= short1; j += 16) { - for (int k = -short1; k <= short1; k += 16) { -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 262c3f910e..a8c7e7931e 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1419,8 +1419,9 @@ public class CraftWorld implements World { - int chunkCoordX = chunkcoordinates.getX() >> 4; - int chunkCoordZ = chunkcoordinates.getZ() >> 4; - // Cycle through the 25x25 Chunks around it to load/unload the chunks. -- for (int x = -12; x <= 12; x++) { -- for (int z = -12; z <= 12; z++) { -+ int radius = world.paperConfig.keepLoadedRange / 16; // Paper -+ for (int x = -radius; x <= radius; x++) { // Paper -+ for (int z = -radius; z <= radius; z++) { // Paper - if (keepLoaded) { - loadChunk(chunkCoordX + x, chunkCoordZ + z); - } else { --- -2.21.0 -