2020-05-06 17:48:49 +08:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2019-05-24 11:12:57 +08:00
|
|
|
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
|
2021-01-11 09:44:06 +08:00
|
|
|
index 38d25a12c6a52d8a83214e2a0f43a218cf15ceac..ffe9b1a63d78925e1d77b9e730aef42fed6d58fa 100644
|
2019-05-24 11:12:57 +08:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2021-01-11 09:44:06 +08:00
|
|
|
@@ -440,4 +440,10 @@ public class PaperWorldConfig {
|
2019-05-24 11:12:57 +08:00
|
|
|
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
|
2021-05-11 11:47:51 +08:00
|
|
|
index e885e5c4c772a87c0359ed2c56aa71a856c3be59..334fe66cf49404c7514b317629b676e52f1841cb 100644
|
2019-05-24 11:12:57 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2021-05-11 11:47:51 +08:00
|
|
|
@@ -718,35 +718,36 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
2020-12-01 21:23:44 +08:00
|
|
|
|
|
|
|
// CraftBukkit start
|
|
|
|
public void loadSpawn(WorldLoadListener worldloadlistener, WorldServer worldserver) {
|
|
|
|
- if (!worldserver.getWorld().getKeepSpawnInMemory()) {
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
+ ChunkProviderServer chunkproviderserver = worldserver.getChunkProvider(); // Paper
|
|
|
|
|
|
|
|
// WorldServer worldserver = this.E();
|
2019-05-24 11:12:57 +08:00
|
|
|
this.forceTicks = true;
|
|
|
|
// CraftBukkit end
|
2020-12-01 21:23:44 +08:00
|
|
|
+ if (worldserver.getWorld().getKeepSpawnInMemory()) { // Paper
|
2019-05-24 11:12:57 +08:00
|
|
|
|
2020-06-25 22:09:55 +08:00
|
|
|
MinecraftServer.LOGGER.info("Preparing start region for dimension {}", worldserver.getDimensionKey().a());
|
2019-05-24 11:12:57 +08:00
|
|
|
BlockPosition blockposition = worldserver.getSpawn();
|
|
|
|
|
2020-12-01 21:23:44 +08:00
|
|
|
worldloadlistener.a(new ChunkCoordIntPair(blockposition));
|
|
|
|
- ChunkProviderServer chunkproviderserver = worldserver.getChunkProvider();
|
|
|
|
+ //ChunkProviderServer chunkproviderserver = worldserver.getChunkProvider(); // Paper - move up
|
2019-05-24 11:12:57 +08:00
|
|
|
|
|
|
|
chunkproviderserver.getLightEngine().a(500);
|
|
|
|
this.nextTick = SystemUtils.getMonotonicMillis();
|
|
|
|
- chunkproviderserver.addTicket(TicketType.START, new ChunkCoordIntPair(blockposition), 11, Unit.INSTANCE);
|
2019-09-30 09:23:09 +08:00
|
|
|
-
|
|
|
|
- while (chunkproviderserver.b() != 441) {
|
|
|
|
- // CraftBukkit start
|
|
|
|
- // this.nextTick = SystemUtils.getMonotonicMillis() + 10L;
|
|
|
|
- this.executeModerately();
|
|
|
|
- // CraftBukkit end
|
2020-12-01 21:23:44 +08:00
|
|
|
- }
|
|
|
|
-
|
|
|
|
+ // 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);
|
2020-06-26 14:29:44 +08:00
|
|
|
+ LOGGER.info("Loaded " + chunkproviderserver.b() + " spawn chunks for world " + worldserver.getWorld().getName()); // Paper
|
2020-12-01 21:23:44 +08:00
|
|
|
+ // Paper end
|
2019-05-24 11:12:57 +08:00
|
|
|
// CraftBukkit start
|
|
|
|
// this.nextTick = SystemUtils.getMonotonicMillis() + 10L;
|
2020-12-01 21:23:44 +08:00
|
|
|
this.executeModerately();
|
|
|
|
// Iterator iterator = this.worldServer.values().iterator();
|
|
|
|
+ }
|
|
|
|
|
|
|
|
if (true) {
|
|
|
|
WorldServer worldserver1 = worldserver;
|
2021-05-11 11:47:51 +08:00
|
|
|
@@ -769,7 +770,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
2021-04-23 00:54:11 +08:00
|
|
|
// this.nextTick = SystemUtils.getMonotonicMillis() + 10L;
|
|
|
|
this.executeModerately();
|
|
|
|
// CraftBukkit end
|
|
|
|
- worldloadlistener.b();
|
|
|
|
+ if (worldserver.getWorld().getKeepSpawnInMemory()) worldloadlistener.b(); // Paper
|
|
|
|
chunkproviderserver.getLightEngine().a(5);
|
|
|
|
// CraftBukkit start
|
|
|
|
// this.updateSpawnFlags();
|
2021-03-16 15:19:45 +08:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
|
2021-05-10 04:50:09 +08:00
|
|
|
index fbff779fa581a661cc03850bffa0da346ce15625..d308197995a92f5be8f5b928fa9ae83dd659545c 100644
|
2021-03-16 15:19:45 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
|
2021-03-16 21:04:28 +08:00
|
|
|
@@ -67,6 +67,7 @@ import net.minecraft.network.protocol.game.PacketPlayOutWorldEvent;
|
|
|
|
import net.minecraft.network.protocol.game.PacketPlayOutWorldParticles;
|
|
|
|
import net.minecraft.resources.MinecraftKey;
|
|
|
|
import net.minecraft.resources.ResourceKey;
|
|
|
|
+import net.minecraft.server.MCUtil;
|
|
|
|
import net.minecraft.server.MinecraftServer;
|
|
|
|
import net.minecraft.server.ScoreboardServer;
|
|
|
|
import net.minecraft.server.level.progress.WorldLoadListener;
|
2021-05-10 04:50:09 +08:00
|
|
|
@@ -1673,12 +1674,88 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
2020-08-25 10:22:08 +08:00
|
|
|
return ((PersistentIdCounts) this.getMinecraftServer().E().getWorldPersistentData().a(PersistentIdCounts::new, "idcounts")).a();
|
2019-05-24 11:12:57 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start - helper function for configurable spawn radius
|
|
|
|
+ public void addTicketsForSpawn(int radiusInBlocks, BlockPosition spawn) {
|
2019-06-14 10:27:40 +08:00
|
|
|
+ // 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
|
2019-05-24 11:12:57 +08:00
|
|
|
+ ChunkProviderServer chunkproviderserver = this.getChunkProvider();
|
2019-06-14 10:27:40 +08:00
|
|
|
+ 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.addTicket(TicketType.START, new ChunkCoordIntPair(spawn.add(x, 0, z)), 2, Unit.INSTANCE);
|
2019-05-24 11:12:57 +08:00
|
|
|
+ }
|
|
|
|
+ }
|
2019-06-14 10:27:40 +08:00
|
|
|
+
|
|
|
|
+ // add border chunks
|
|
|
|
+
|
|
|
|
+ // add border along x axis (including corner chunks)
|
|
|
|
+ for (int x = -radiusInBlocks; x <= radiusInBlocks; x += 16) {
|
|
|
|
+ // top
|
|
|
|
+ chunkproviderserver.addTicket(TicketType.START, new ChunkCoordIntPair(spawn.add(x, 0, radiusInBlocks)), 1, Unit.INSTANCE); // level 32
|
|
|
|
+ // bottom
|
|
|
|
+ chunkproviderserver.addTicket(TicketType.START, new ChunkCoordIntPair(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.addTicket(TicketType.START, new ChunkCoordIntPair(spawn.add(radiusInBlocks, 0, z)), 1, Unit.INSTANCE); // level 32
|
|
|
|
+ // left
|
|
|
|
+ chunkproviderserver.addTicket(TicketType.START, new ChunkCoordIntPair(spawn.add(-radiusInBlocks, 0, z)), 1, Unit.INSTANCE); // level 32
|
|
|
|
+ }
|
2020-04-19 18:01:07 +08:00
|
|
|
+
|
|
|
|
+ MCUtil.getSpiralOutChunks(spawn, radiusInBlocks >> 4).forEach(pair -> {
|
|
|
|
+ getChunkProvider().getChunkAtMainThread(pair.x, pair.z);
|
|
|
|
+ });
|
2019-05-24 11:12:57 +08:00
|
|
|
+ }
|
|
|
|
+ public void removeTicketsForSpawn(int radiusInBlocks, BlockPosition spawn) {
|
2019-06-14 10:27:40 +08:00
|
|
|
+ // 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
|
2019-05-24 11:12:57 +08:00
|
|
|
+ ChunkProviderServer chunkproviderserver = this.getChunkProvider();
|
2019-06-14 10:27:40 +08:00
|
|
|
+ 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.removeTicket(TicketType.START, new ChunkCoordIntPair(spawn.add(x, 0, z)), 2, Unit.INSTANCE);
|
2019-05-24 11:12:57 +08:00
|
|
|
+ }
|
|
|
|
+ }
|
2019-06-14 10:27:40 +08:00
|
|
|
+
|
|
|
|
+ // remove border chunks
|
|
|
|
+
|
|
|
|
+ // remove border along x axis (including corner chunks)
|
|
|
|
+ for (int x = -radiusInBlocks; x <= radiusInBlocks; x += 16) {
|
|
|
|
+ // top
|
|
|
|
+ chunkproviderserver.removeTicket(TicketType.START, new ChunkCoordIntPair(spawn.add(x, 0, radiusInBlocks)), 1, Unit.INSTANCE); // level 32
|
|
|
|
+ // bottom
|
|
|
|
+ chunkproviderserver.removeTicket(TicketType.START, new ChunkCoordIntPair(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.removeTicket(TicketType.START, new ChunkCoordIntPair(spawn.add(radiusInBlocks, 0, z)), 1, Unit.INSTANCE); // level 32
|
|
|
|
+ // left
|
|
|
|
+ chunkproviderserver.removeTicket(TicketType.START, new ChunkCoordIntPair(spawn.add(-radiusInBlocks, 0, z)), 1, Unit.INSTANCE); // level 32
|
|
|
|
+ }
|
2019-05-24 11:12:57 +08:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
2020-08-25 10:22:08 +08:00
|
|
|
public void a(BlockPosition blockposition, float f) {
|
2020-06-25 22:09:55 +08:00
|
|
|
- ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(new BlockPosition(this.worldData.a(), 0, this.worldData.c()));
|
2019-05-24 11:12:57 +08:00
|
|
|
+ // Paper - configurable spawn radius
|
|
|
|
+ BlockPosition prevSpawn = this.getSpawn();
|
2020-06-25 22:09:55 +08:00
|
|
|
+ //ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(new BlockPosition(this.worldData.a(), 0, this.worldData.c()));
|
2019-05-24 11:12:57 +08:00
|
|
|
|
2020-08-25 10:22:08 +08:00
|
|
|
this.worldData.setSpawn(blockposition, f);
|
2019-05-24 11:12:57 +08:00
|
|
|
- this.getChunkProvider().removeTicket(TicketType.START, chunkcoordintpair, 11, Unit.INSTANCE);
|
|
|
|
- this.getChunkProvider().addTicket(TicketType.START, new ChunkCoordIntPair(blockposition), 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, blockposition);
|
|
|
|
+ }
|
2020-08-25 10:22:08 +08:00
|
|
|
this.getMinecraftServer().getPlayerList().sendAll(new PacketPlayOutSpawnPosition(blockposition, f));
|
2019-05-24 11:12:57 +08:00
|
|
|
}
|
|
|
|
|
2021-03-16 15:19:45 +08:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/progress/WorldLoadListener.java b/src/main/java/net/minecraft/server/level/progress/WorldLoadListener.java
|
|
|
|
index de011b5e3a5e751160b4d3b65b50f28e6c6a5f52..4d9c167a41366779dbfb5ded6ea0115ffbf06ed7 100644
|
|
|
|
--- a/src/main/java/net/minecraft/server/level/progress/WorldLoadListener.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/progress/WorldLoadListener.java
|
|
|
|
@@ -11,4 +11,6 @@ public interface WorldLoadListener {
|
|
|
|
void a(ChunkCoordIntPair chunkcoordintpair, @Nullable ChunkStatus chunkstatus);
|
|
|
|
|
|
|
|
void b();
|
|
|
|
+
|
|
|
|
+ void setChunkRadius(int radius); // Paper - allow changing chunk radius
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/progress/WorldLoadListenerLogger.java b/src/main/java/net/minecraft/server/level/progress/WorldLoadListenerLogger.java
|
|
|
|
index 872d00de41533ab7f4b43874de6c1747022e2ac5..ca81664d884e80e5cb1eb376a2c2ef1e017f16c0 100644
|
|
|
|
--- a/src/main/java/net/minecraft/server/level/progress/WorldLoadListenerLogger.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/progress/WorldLoadListenerLogger.java
|
|
|
|
@@ -12,16 +12,24 @@ import org.apache.logging.log4j.Logger;
|
|
|
|
public class WorldLoadListenerLogger implements WorldLoadListener {
|
|
|
|
|
|
|
|
private static final Logger LOGGER = LogManager.getLogger();
|
|
|
|
- private final int b;
|
|
|
|
+ private int b; // Paper - remove final
|
|
|
|
private int c;
|
|
|
|
private long d;
|
|
|
|
private long e = Long.MAX_VALUE;
|
|
|
|
|
|
|
|
public WorldLoadListenerLogger(int i) {
|
|
|
|
- int j = i * 2 + 1;
|
|
|
|
+ // Paper start - Allow changing radius later for configurable spawn patch
|
|
|
|
+ this.setChunkRadius(i); // Move to method
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setChunkRadius(int radius) {
|
|
|
|
+ // Paper - copied from above
|
|
|
|
+ int j = radius * 2 + 1;
|
|
|
|
|
|
|
|
this.b = j * j;
|
|
|
|
}
|
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void a(ChunkCoordIntPair chunkcoordintpair) {
|
2019-05-24 11:12:57 +08:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2021-05-10 04:50:09 +08:00
|
|
|
index 5a5f920954effbe549cacdaa39474989dc98ad75..ec9f9fdf1be4f1e68eea5554a6721efd11a53958 100644
|
2019-05-24 11:12:57 +08:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2021-04-18 15:52:36 +08:00
|
|
|
@@ -1972,15 +1972,21 @@ public class CraftWorld implements World {
|
2019-05-24 11:12:57 +08:00
|
|
|
|
|
|
|
@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
|
|
|
|
- BlockPosition chunkcoordinates = this.world.getSpawn();
|
|
|
|
+ BlockPosition prevSpawn = this.world.getSpawn();
|
|
|
|
if (keepLoaded) {
|
|
|
|
- world.getChunkProvider().addTicket(TicketType.START, new ChunkCoordIntPair(chunkcoordinates), 11, Unit.INSTANCE);
|
|
|
|
+ world.addTicketsForSpawn(world.paperConfig.keepLoadedRange, prevSpawn);
|
|
|
|
} else {
|
|
|
|
- // TODO: doesn't work well if spawn changed....
|
|
|
|
- world.getChunkProvider().removeTicket(TicketType.START, new ChunkCoordIntPair(chunkcoordinates), 11, Unit.INSTANCE);
|
|
|
|
+ // TODO: doesn't work well if spawn changed.... // paper - resolved
|
|
|
|
+ world.removeTicketsForSpawn(world.paperConfig.keepLoadedRange, prevSpawn);
|
|
|
|
}
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|