261 Zeilen
13 KiB
Diff
261 Zeilen
13 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
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 38d25a12c6a52d8a83214e2a0f43a218cf15ceac..ffe9b1a63d78925e1d77b9e730aef42fed6d58fa 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -440,4 +440,10 @@ public class PaperWorldConfig {
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ public short keepLoadedRange;
|
||
|
|
+ private void keepLoadedRange() {
|
||
|
|
+ keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 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 9beda5e429b5c520a41d9c7f536dc48dbb6f6f9e..0efe7024493f96bb54e7d8c1ea7b233a1b481a04 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
|
@@ -716,35 +716,36 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||
|
|
|
||
|
|
// CraftBukkit start
|
||
|
|
public void loadSpawn(ChunkProgressListener worldloadlistener, ServerLevel worldserver) {
|
||
|
|
- if (!worldserver.getWorld().getKeepSpawnInMemory()) {
|
||
|
|
- return;
|
||
|
|
- }
|
||
|
|
+ ServerChunkCache chunkproviderserver = worldserver.getChunkSource(); // Paper
|
||
|
|
|
||
|
|
// WorldServer worldserver = this.E();
|
||
|
|
this.forceTicks = true;
|
||
|
|
// CraftBukkit end
|
||
|
|
+ if (worldserver.getWorld().getKeepSpawnInMemory()) { // Paper
|
||
|
|
|
||
|
|
MinecraftServer.LOGGER.info("Preparing start region for dimension {}", worldserver.dimension().location());
|
||
|
|
BlockPos blockposition = worldserver.getSpawn();
|
||
|
|
|
||
|
|
worldloadlistener.updateSpawnPos(new ChunkPos(blockposition));
|
||
|
|
- ServerChunkCache chunkproviderserver = worldserver.getChunkSource();
|
||
|
|
+ //ChunkProviderServer chunkproviderserver = worldserver.getChunkProvider(); // Paper - move up
|
||
|
|
|
||
|
|
chunkproviderserver.getLightEngine().setTaskPerBatch(500);
|
||
|
|
this.nextTickTime = Util.getMillis();
|
||
|
|
- chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(blockposition), 11, Unit.INSTANCE);
|
||
|
|
-
|
||
|
|
- while (chunkproviderserver.getTickingGenerated() != 441) {
|
||
|
|
- // CraftBukkit start
|
||
|
|
- // this.nextTick = SystemUtils.getMonotonicMillis() + 10L;
|
||
|
|
- this.executeModerately();
|
||
|
|
- // CraftBukkit end
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
+ // Paper start - configurable spawn reason
|
||
|
|
+ int radiusBlocks = worldserver.paperConfig.keepLoadedRange;
|
||
|
|
+ int radiusChunks = radiusBlocks / 16 + ((radiusBlocks & 15) != 0 ? 1 : 0);
|
||
|
|
+ int totalChunks = ((radiusChunks) * 2 + 1);
|
||
|
|
+ totalChunks *= totalChunks;
|
||
|
|
+ worldloadlistener.setChunkRadius(radiusBlocks / 16);
|
||
|
|
+
|
||
|
|
+ worldserver.addTicketsForSpawn(radiusBlocks, blockposition);
|
||
|
|
+ //LOGGER.info("Loaded " + chunkproviderserver.b() + " spawn chunks for world " + worldserver.getWorld().getName()); // Paper
|
||
|
|
+ // Paper end
|
||
|
|
// CraftBukkit start
|
||
|
|
// this.nextTick = SystemUtils.getMonotonicMillis() + 10L;
|
||
|
|
this.executeModerately();
|
||
|
|
// Iterator iterator = this.worldServer.values().iterator();
|
||
|
|
+ }
|
||
|
|
|
||
|
|
if (true) {
|
||
|
|
ServerLevel worldserver1 = worldserver;
|
||
|
|
@@ -767,7 +768,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||
|
|
// this.nextTick = SystemUtils.getMonotonicMillis() + 10L;
|
||
|
|
this.executeModerately();
|
||
|
|
// CraftBukkit end
|
||
|
|
- worldloadlistener.stop();
|
||
|
|
+ if (worldserver.getWorld().getKeepSpawnInMemory()) worldloadlistener.stop(); // Paper
|
||
|
|
chunkproviderserver.getLightEngine().setTaskPerBatch(5);
|
||
|
|
// CraftBukkit start
|
||
|
|
// this.updateSpawnFlags();
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
index 20b74fc8e1273fcd07ea4417eaedc8bd9aba93b3..b2ddf145ae9f581ec6820deb9cb6a98be87658d7 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||
|
|
@@ -66,6 +66,7 @@ import net.minecraft.network.protocol.game.ClientboundSoundPacket;
|
||
|
|
import net.minecraft.network.protocol.game.DebugPackets;
|
||
|
|
import net.minecraft.resources.ResourceKey;
|
||
|
|
import net.minecraft.resources.ResourceLocation;
|
||
|
|
+import net.minecraft.server.MCUtil;
|
||
|
|
import net.minecraft.server.MinecraftServer;
|
||
|
|
import net.minecraft.server.ServerScoreboard;
|
||
|
|
import net.minecraft.server.level.progress.ChunkProgressListener;
|
||
|
|
@@ -1667,12 +1668,88 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
|
||
|
|
return ((MapIndex) this.getServer().overworld().getDataStorage().computeIfAbsent(MapIndex::new, "idcounts")).getFreeAuxValueForMap();
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // Paper start - helper function for configurable spawn radius
|
||
|
|
+ public void addTicketsForSpawn(int radiusInBlocks, BlockPos spawn) {
|
||
|
|
+ // In order to respect vanilla behavior, which is ensuring everything but the spawn border can tick, we add tickets
|
||
|
|
+ // with level 31 for the non-border spawn chunks
|
||
|
|
+ ServerChunkCache chunkproviderserver = this.getChunkSource();
|
||
|
|
+ int tickRadius = radiusInBlocks - 16;
|
||
|
|
+
|
||
|
|
+ // add ticking chunks
|
||
|
|
+ for (int x = -tickRadius; x <= tickRadius; x += 16) {
|
||
|
|
+ for (int z = -tickRadius; z <= tickRadius; z += 16) {
|
||
|
|
+ // radius of 2 will have the current chunk be level 31
|
||
|
|
+ chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(spawn.add(x, 0, z)), 2, Unit.INSTANCE);
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ // add border chunks
|
||
|
|
+
|
||
|
|
+ // add border along x axis (including corner chunks)
|
||
|
|
+ for (int x = -radiusInBlocks; x <= radiusInBlocks; x += 16) {
|
||
|
|
+ // top
|
||
|
|
+ chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(spawn.add(x, 0, radiusInBlocks)), 1, Unit.INSTANCE); // level 32
|
||
|
|
+ // bottom
|
||
|
|
+ chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(spawn.add(x, 0, -radiusInBlocks)), 1, Unit.INSTANCE); // level 32
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ // add border along z axis (excluding corner chunks)
|
||
|
|
+ for (int z = -radiusInBlocks + 16; z < radiusInBlocks; z += 16) {
|
||
|
|
+ // right
|
||
|
|
+ chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(spawn.add(radiusInBlocks, 0, z)), 1, Unit.INSTANCE); // level 32
|
||
|
|
+ // left
|
||
|
|
+ chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(spawn.add(-radiusInBlocks, 0, z)), 1, Unit.INSTANCE); // level 32
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ MCUtil.getSpiralOutChunks(spawn, radiusInBlocks >> 4).forEach(pair -> {
|
||
|
|
+ getChunkSource().getChunkAtMainThread(pair.x, pair.z);
|
||
|
|
+ });
|
||
|
|
+ }
|
||
|
|
+ public void removeTicketsForSpawn(int radiusInBlocks, BlockPos spawn) {
|
||
|
|
+ // In order to respect vanilla behavior, which is ensuring everything but the spawn border can tick, we added tickets
|
||
|
|
+ // with level 31 for the non-border spawn chunks
|
||
|
|
+ ServerChunkCache chunkproviderserver = this.getChunkSource();
|
||
|
|
+ int tickRadius = radiusInBlocks - 16;
|
||
|
|
+
|
||
|
|
+ // remove ticking chunks
|
||
|
|
+ for (int x = -tickRadius; x <= tickRadius; x += 16) {
|
||
|
|
+ for (int z = -tickRadius; z <= tickRadius; z += 16) {
|
||
|
|
+ // radius of 2 will have the current chunk be level 31
|
||
|
|
+ chunkproviderserver.removeRegionTicket(TicketType.START, new ChunkPos(spawn.add(x, 0, z)), 2, Unit.INSTANCE);
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ // remove border chunks
|
||
|
|
+
|
||
|
|
+ // remove border along x axis (including corner chunks)
|
||
|
|
+ for (int x = -radiusInBlocks; x <= radiusInBlocks; x += 16) {
|
||
|
|
+ // top
|
||
|
|
+ chunkproviderserver.removeRegionTicket(TicketType.START, new ChunkPos(spawn.add(x, 0, radiusInBlocks)), 1, Unit.INSTANCE); // level 32
|
||
|
|
+ // bottom
|
||
|
|
+ chunkproviderserver.removeRegionTicket(TicketType.START, new ChunkPos(spawn.add(x, 0, -radiusInBlocks)), 1, Unit.INSTANCE); // level 32
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ // remove border along z axis (excluding corner chunks)
|
||
|
|
+ for (int z = -radiusInBlocks + 16; z < radiusInBlocks; z += 16) {
|
||
|
|
+ // right
|
||
|
|
+ chunkproviderserver.removeRegionTicket(TicketType.START, new ChunkPos(spawn.add(radiusInBlocks, 0, z)), 1, Unit.INSTANCE); // level 32
|
||
|
|
+ // left
|
||
|
|
+ chunkproviderserver.removeRegionTicket(TicketType.START, new ChunkPos(spawn.add(-radiusInBlocks, 0, z)), 1, Unit.INSTANCE); // level 32
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
public void setDefaultSpawnPos(BlockPos pos, float angle) {
|
||
|
|
- ChunkPos chunkcoordintpair = new ChunkPos(new BlockPos(this.levelData.getXSpawn(), 0, this.levelData.getZSpawn()));
|
||
|
|
+ // Paper - configurable spawn radius
|
||
|
|
+ BlockPos prevSpawn = this.getSpawn();
|
||
|
|
+ //ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(new BlockPosition(this.worldData.a(), 0, this.worldData.c()));
|
||
|
|
|
||
|
|
this.levelData.setSpawn(pos, angle);
|
||
|
|
- this.getChunkSource().removeRegionTicket(TicketType.START, chunkcoordintpair, 11, Unit.INSTANCE);
|
||
|
|
- this.getChunkSource().addRegionTicket(TicketType.START, new ChunkPos(pos), 11, Unit.INSTANCE);
|
||
|
|
+ if (this.keepSpawnInMemory) {
|
||
|
|
+ // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add
|
||
|
|
+ this.removeTicketsForSpawn(this.paperConfig.keepLoadedRange, prevSpawn);
|
||
|
|
+ this.addTicketsForSpawn(this.paperConfig.keepLoadedRange, pos);
|
||
|
|
+ }
|
||
|
|
this.getServer().getPlayerList().broadcastAll(new ClientboundSetDefaultSpawnPositionPacket(pos, angle));
|
||
|
|
}
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/level/progress/ChunkProgressListener.java b/src/main/java/net/minecraft/server/level/progress/ChunkProgressListener.java
|
||
|
|
index 2860a16c80e56edb333115f6f64f65d0e56feb11..85863211a666b299cae8a3791c182ae5094b94d9 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/progress/ChunkProgressListener.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/progress/ChunkProgressListener.java
|
||
|
|
@@ -11,4 +11,6 @@ public interface ChunkProgressListener {
|
||
|
|
void onStatusChange(ChunkPos pos, @Nullable ChunkStatus status);
|
||
|
|
|
||
|
|
void stop();
|
||
|
|
+
|
||
|
|
+ void setChunkRadius(int radius); // Paper - allow changing chunk radius
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/level/progress/LoggerChunkProgressListener.java b/src/main/java/net/minecraft/server/level/progress/LoggerChunkProgressListener.java
|
||
|
|
index 4a541f0b2582430abda6e5ff8f492e37fc903483..e810843fae13d3e83e8f509810b781859217c48b 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/progress/LoggerChunkProgressListener.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/progress/LoggerChunkProgressListener.java
|
||
|
|
@@ -12,16 +12,24 @@ import org.apache.logging.log4j.Logger;
|
||
|
|
public class LoggerChunkProgressListener implements ChunkProgressListener {
|
||
|
|
|
||
|
|
private static final Logger LOGGER = LogManager.getLogger();
|
||
|
|
- private final int maxCount;
|
||
|
|
+ private int maxCount; // Paper - remove final
|
||
|
|
private int count;
|
||
|
|
private long startTime;
|
||
|
|
private long nextTickTime = Long.MAX_VALUE;
|
||
|
|
|
||
|
|
public LoggerChunkProgressListener(int radius) {
|
||
|
|
+ // Paper start - Allow changing radius later for configurable spawn patch
|
||
|
|
+ this.setChunkRadius(radius); // Move to method
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ @Override
|
||
|
|
+ public void setChunkRadius(int radius) {
|
||
|
|
+ // Paper - copied from above
|
||
|
|
int j = radius * 2 + 1;
|
||
|
|
|
||
|
|
this.maxCount = j * j;
|
||
|
|
}
|
||
|
|
+ // Paper end
|
||
|
|
|
||
|
|
@Override
|
||
|
|
public void updateSpawnPos(ChunkPos spawnPos) {
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
index 6e9e2149d854f26826d030ee6e655ca8fa7b5141..0cb0021fac211996c5bdbb2cfc8f54addc3b49f6 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
@@ -1954,15 +1954,21 @@ public class CraftWorld implements World {
|
||
|
|
|
||
|
|
@Override
|
||
|
|
public void setKeepSpawnInMemory(boolean keepLoaded) {
|
||
|
|
+ // Paper start - Configurable spawn radius
|
||
|
|
+ if (keepLoaded == world.keepSpawnInMemory) {
|
||
|
|
+ // do nothing, nothing has changed
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
world.keepSpawnInMemory = keepLoaded;
|
||
|
|
// Grab the worlds spawn chunk
|
||
|
|
- BlockPos chunkcoordinates = this.world.getSpawn();
|
||
|
|
+ BlockPos prevSpawn = this.world.getSpawn();
|
||
|
|
if (keepLoaded) {
|
||
|
|
- world.getChunkSource().addRegionTicket(TicketType.START, new ChunkPos(chunkcoordinates), 11, Unit.INSTANCE);
|
||
|
|
+ world.addTicketsForSpawn(world.paperConfig.keepLoadedRange, prevSpawn);
|
||
|
|
} else {
|
||
|
|
- // TODO: doesn't work well if spawn changed....
|
||
|
|
- world.getChunkSource().removeRegionTicket(TicketType.START, new ChunkPos(chunkcoordinates), 11, Unit.INSTANCE);
|
||
|
|
+ // TODO: doesn't work well if spawn changed.... // paper - resolved
|
||
|
|
+ world.removeTicketsForSpawn(world.paperConfig.keepLoadedRange, prevSpawn);
|
||
|
|
}
|
||
|
|
+ // Paper end
|
||
|
|
}
|
||
|
|
|
||
|
|
@Override
|