mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-15 08:28:01 +02:00
de04cbced5
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: f29cb801 Separate checkstyle-suppressions file is not required 86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack 9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode() 994a6163 Attempt upgrade of resolver libraries CraftBukkit Changes: b3b43a6ad Add Checkstyle check for unused imports 13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names 3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API 2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor 1dbdbbed4 PR-1238: Remove unnecessary sign ticking 659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper e37e29ce0 Increase outdated build delay c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack 492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode() e11fbb9d7 Upgrade MySQL driver 9f3a0bd2a Attempt upgrade of resolver libraries 60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion Spigot Changes: 06d602e7 Rebuild patches
222 lines
12 KiB
Diff
222 lines
12 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/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
index af90bb579429336cc4e99386fd620c898c23d274..96fd66ed2742a79064852af6e936830ddaf14f4c 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -768,30 +768,33 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
|
|
// CraftBukkit start
|
|
public void prepareLevels(ChunkProgressListener worldloadlistener, ServerLevel worldserver) {
|
|
+ ServerChunkCache chunkproviderserver = worldserver.getChunkSource(); // Paper
|
|
// WorldServer worldserver = this.overworld();
|
|
this.forceTicks = true;
|
|
// CraftBukkit end
|
|
+ if (worldserver.getWorld().getKeepSpawnInMemory()) { // Paper
|
|
|
|
MinecraftServer.LOGGER.info("Preparing start region for dimension {}", worldserver.dimension().location());
|
|
BlockPos blockposition = worldserver.getSharedSpawnPos();
|
|
|
|
worldloadlistener.updateSpawnPos(new ChunkPos(blockposition));
|
|
- ServerChunkCache chunkproviderserver = worldserver.getChunkSource();
|
|
+ //ChunkProviderServer chunkproviderserver = worldserver.getChunkProvider(); // Paper - move up
|
|
|
|
this.nextTickTimeNanos = Util.getNanos();
|
|
- // CraftBukkit start
|
|
- if (worldserver.getWorld().getKeepSpawnInMemory()) {
|
|
- chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(blockposition), 11, Unit.INSTANCE);
|
|
-
|
|
- while (chunkproviderserver.getTickingGenerated() != 441) {
|
|
- // this.nextTickTimeNanos = SystemUtils.getNanos() + MinecraftServer.PREPARE_LEVELS_DEFAULT_DELAY_NANOS;
|
|
- this.executeModerately();
|
|
- }
|
|
- }
|
|
+ // Paper start - configurable spawn reason
|
|
+ int radiusBlocks = worldserver.paperConfig().spawn.keepSpawnLoadedRange * 16;
|
|
+ int radiusChunks = radiusBlocks / 16 + ((radiusBlocks & 15) != 0 ? 1 : 0);
|
|
+ int totalChunks = ((radiusChunks) * 2 + 1);
|
|
+ totalChunks *= totalChunks;
|
|
+ worldloadlistener.setChunkRadius(radiusBlocks / 16);
|
|
+
|
|
+ worldserver.addTicketsForSpawn(radiusBlocks, blockposition);
|
|
+ // Paper end
|
|
|
|
// this.nextTickTimeNanos = SystemUtils.getNanos() + MinecraftServer.PREPARE_LEVELS_DEFAULT_DELAY_NANOS;
|
|
this.executeModerately();
|
|
// Iterator iterator = this.levels.values().iterator();
|
|
+ }
|
|
|
|
if (true) {
|
|
ServerLevel worldserver1 = worldserver;
|
|
@@ -814,7 +817,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
// this.nextTickTimeNanos = SystemUtils.getNanos() + MinecraftServer.PREPARE_LEVELS_DEFAULT_DELAY_NANOS;
|
|
this.executeModerately();
|
|
// CraftBukkit end
|
|
- worldloadlistener.stop();
|
|
+ if (worldserver.getWorld().getKeepSpawnInMemory()) worldloadlistener.stop(); // Paper
|
|
// CraftBukkit start
|
|
// this.updateMobSpawningFlags();
|
|
worldserver.setSpawnSettings(this.isSpawningMonsters(), this.isSpawningAnimals());
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
index 45a6277c93f6d6370442664a8777b08977df0a6b..de4a35992002b962f680d3c43daf51f87f91fef0 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
@@ -1893,12 +1893,84 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
|
return ((MapIndex) this.getServer().overworld().getDataStorage().computeIfAbsent(MapIndex.factory(), "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.offset(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.offset(x, 0, radiusInBlocks)), 1, Unit.INSTANCE); // level 32
|
|
+ // bottom
|
|
+ chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(spawn.offset(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.offset(radiusInBlocks, 0, z)), 1, Unit.INSTANCE); // level 32
|
|
+ // left
|
|
+ chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(spawn.offset(-radiusInBlocks, 0, z)), 1, Unit.INSTANCE); // level 32
|
|
+ }
|
|
+ }
|
|
+ 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.offset(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.offset(x, 0, radiusInBlocks)), 1, Unit.INSTANCE); // level 32
|
|
+ // bottom
|
|
+ chunkproviderserver.removeRegionTicket(TicketType.START, new ChunkPos(spawn.offset(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.offset(radiusInBlocks, 0, z)), 1, Unit.INSTANCE); // level 32
|
|
+ // left
|
|
+ chunkproviderserver.removeRegionTicket(TicketType.START, new ChunkPos(spawn.offset(-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.getSharedSpawnPos();
|
|
+ //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().spawn.keepSpawnLoadedRange * 16, prevSpawn);
|
|
+ this.addTicketsForSpawn(this.paperConfig().spawn.keepSpawnLoadedRange * 16, 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 1b565b2809c2d367e21971c5154f35c9763995e6..b0f899835ded29aff108d1674bf4a1a6c89693db 100644
|
|
--- a/src/main/java/net/minecraft/server/level/progress/ChunkProgressListener.java
|
|
+++ b/src/main/java/net/minecraft/server/level/progress/ChunkProgressListener.java
|
|
@@ -12,4 +12,6 @@ public interface ChunkProgressListener {
|
|
void start();
|
|
|
|
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 4d2348df25410a0b5364eec066880326d6667dad..286aad3205ef8a9e21a47ef07893844fe857556a 100644
|
|
--- a/src/main/java/net/minecraft/server/level/progress/LoggerChunkProgressListener.java
|
|
+++ b/src/main/java/net/minecraft/server/level/progress/LoggerChunkProgressListener.java
|
|
@@ -11,12 +11,19 @@ import org.slf4j.Logger;
|
|
|
|
public class LoggerChunkProgressListener implements ChunkProgressListener {
|
|
private static final Logger LOGGER = LogUtils.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 end
|
|
int i = radius * 2 + 1;
|
|
this.maxCount = i * i;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
index ca02281f12b0d914ad76da57aab56b63bb59d1f1..9cae07b33e1426c17e118fa8648c245753b316e6 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
@@ -1359,15 +1359,21 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
|
|
|
@Override
|
|
public void setKeepSpawnInMemory(boolean keepLoaded) {
|
|
+ // Paper start - Configurable spawn radius
|
|
+ if (keepLoaded == this.world.keepSpawnInMemory) {
|
|
+ // do nothing, nothing has changed
|
|
+ return;
|
|
+ }
|
|
this.world.keepSpawnInMemory = keepLoaded;
|
|
// Grab the worlds spawn chunk
|
|
BlockPos chunkcoordinates = this.world.getSharedSpawnPos();
|
|
if (keepLoaded) {
|
|
- this.world.getChunkSource().addRegionTicket(TicketType.START, new ChunkPos(chunkcoordinates), 11, Unit.INSTANCE);
|
|
+ this.world.addTicketsForSpawn(this.world.paperConfig().spawn.keepSpawnLoadedRange * 16, chunkcoordinates);
|
|
} else {
|
|
- // TODO: doesn't work well if spawn changed....
|
|
- this.world.getChunkSource().removeRegionTicket(TicketType.START, new ChunkPos(chunkcoordinates), 11, Unit.INSTANCE);
|
|
+ // TODO: doesn't work well if spawn changed.... // Paper - resolved
|
|
+ this.world.removeTicketsForSpawn(this.world.paperConfig().spawn.keepSpawnLoadedRange * 16, chunkcoordinates);
|
|
}
|
|
+ // Paper end
|
|
}
|
|
|
|
@Override
|