mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 04:55:47 +01:00
88ab784da0
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 CraftBukkit Changes: 28d72c4bd SPIGOT-6428: World.generateTree does not generate bee nests
130 lines
7.3 KiB
Diff
130 lines
7.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Tue, 9 Jun 2020 03:33:03 -0400
|
|
Subject: [PATCH] Add Plugin Tickets to API Chunk Methods
|
|
|
|
Like previous versions, plugins loading chunks kept them loaded until
|
|
they garbage collected to avoid constant spamming of chunk loads
|
|
|
|
This adds tickets to a few more places so that they can be unloaded.
|
|
|
|
Additionally, this drops their ticket level to BORDER so they wont be ticking
|
|
so they will just sit inactive instead.
|
|
|
|
Using .loadChunk to keep a chunk ticking was a horrible idea for upstream
|
|
when we have TWO methods that are able to do that already in the API.
|
|
|
|
Also reduce their collection count down to a maximum of 1 second. Barely
|
|
anyone knows what chunk-gc is in bukkit.yml as its less relevant now, and
|
|
since this wasn't spigot behavior, this is safe to mostly ignore (unless someone
|
|
wants it to collect even faster, they can restore that setting back to 1 instead of 20+)
|
|
|
|
Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons.
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index 32e68e403950be62bd0330b268738225c2e70edd..d0c951878600a4227e558bc68d68098c59fb7b2b 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -346,7 +346,7 @@ public final class CraftServer implements Server {
|
|
ambientSpawn = configuration.getInt("spawn-limits.ambient");
|
|
console.autosavePeriod = configuration.getInt("ticks-per.autosave");
|
|
warningState = WarningState.value(configuration.getString("settings.deprecated-verbose"));
|
|
- TicketType.PLUGIN.loadPeriod = configuration.getInt("chunk-gc.period-in-ticks");
|
|
+ TicketType.PLUGIN.loadPeriod = Math.min(20, configuration.getInt("chunk-gc.period-in-ticks")); // Paper - cap plugin loads to 1 second
|
|
minimumAPI = configuration.getString("settings.minimum-api");
|
|
loadIcon();
|
|
}
|
|
@@ -837,7 +837,7 @@ public final class CraftServer implements Server {
|
|
waterAmbientSpawn = configuration.getInt("spawn-limits.water-ambient");
|
|
ambientSpawn = configuration.getInt("spawn-limits.ambient");
|
|
warningState = WarningState.value(configuration.getString("settings.deprecated-verbose"));
|
|
- TicketType.PLUGIN.loadPeriod = configuration.getInt("chunk-gc.period-in-ticks");
|
|
+ TicketType.PLUGIN.loadPeriod = Math.min(20, configuration.getInt("chunk-gc.period-in-ticks")); // Paper - cap plugin loads to 1 second
|
|
minimumAPI = configuration.getString("settings.minimum-api");
|
|
printSaveWarning = false;
|
|
console.autosavePeriod = configuration.getInt("ticks-per.autosave");
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
index 2511c44cc62b7cdce17741c786a58f73f4252955..03761fd7367e184c808f4ef55bdef0838f7427b0 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
@@ -30,6 +30,7 @@ import net.minecraft.network.protocol.game.PacketPlayOutCustomSoundEffect;
|
|
import net.minecraft.network.protocol.game.PacketPlayOutUpdateTime;
|
|
import net.minecraft.network.protocol.game.PacketPlayOutWorldEvent;
|
|
import net.minecraft.resources.MinecraftKey;
|
|
+import net.minecraft.server.MCUtil;
|
|
import net.minecraft.server.level.ChunkMapDistance;
|
|
import net.minecraft.server.level.PlayerChunk;
|
|
import net.minecraft.server.level.PlayerChunkMap;
|
|
@@ -407,8 +408,21 @@ public class CraftWorld implements World {
|
|
|
|
@Override
|
|
public Chunk getChunkAt(int x, int z) {
|
|
- return this.world.getChunkProvider().getChunkAt(x, z, true).bukkitChunk;
|
|
+ // Paper start - add ticket to hold chunk for a little while longer if plugin accesses it
|
|
+ net.minecraft.world.level.chunk.Chunk chunk = world.getChunkProvider().getChunkAtIfLoadedImmediately(x, z);
|
|
+ if (chunk == null) {
|
|
+ addTicket(x, z);
|
|
+ chunk = this.world.getChunkProvider().getChunkAt(x, z, true);
|
|
+ }
|
|
+ return chunk.bukkitChunk;
|
|
+ // Paper end
|
|
+ }
|
|
+
|
|
+ // Paper start
|
|
+ private void addTicket(int x, int z) {
|
|
+ MCUtil.MAIN_EXECUTOR.execute(() -> world.getChunkProvider().addTicket(TicketType.PLUGIN, new ChunkCoordIntPair(x, z), 0, Unit.INSTANCE)); // Paper
|
|
}
|
|
+ // Paper end
|
|
|
|
@Override
|
|
public Chunk getChunkAt(Block block) {
|
|
@@ -483,7 +497,7 @@ public class CraftWorld implements World {
|
|
public boolean unloadChunkRequest(int x, int z) {
|
|
org.spigotmc.AsyncCatcher.catchOp("chunk unload"); // Spigot
|
|
if (isChunkLoaded(x, z)) {
|
|
- world.getChunkProvider().removeTicket(TicketType.PLUGIN, new ChunkCoordIntPair(x, z), 1, Unit.INSTANCE);
|
|
+ world.getChunkProvider().removeTicket(TicketType.PLUGIN, new ChunkCoordIntPair(x, z), 0, Unit.INSTANCE); // Paper
|
|
}
|
|
|
|
return true;
|
|
@@ -560,9 +574,12 @@ public class CraftWorld implements World {
|
|
org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot
|
|
// Paper start - Optimize this method
|
|
ChunkCoordIntPair chunkPos = new ChunkCoordIntPair(x, z);
|
|
+ IChunkAccess immediate = world.getChunkProvider().getChunkAtIfLoadedImmediately(x, z); // Paper
|
|
+ if (immediate != null) return true; // Paper
|
|
|
|
if (!generate) {
|
|
- IChunkAccess immediate = world.getChunkProvider().getChunkAtImmediately(x, z);
|
|
+
|
|
+ //IChunkAccess immediate = world.getChunkProvider().getChunkAtImmediately(x, z); // Paper
|
|
if (immediate == null) {
|
|
immediate = world.getChunkProvider().playerChunkMap.getUnloadingChunk(x, z);
|
|
}
|
|
@@ -570,7 +587,7 @@ public class CraftWorld implements World {
|
|
if (!(immediate instanceof ProtoChunkExtension) && !(immediate instanceof net.minecraft.world.level.chunk.Chunk)) {
|
|
return false; // not full status
|
|
}
|
|
- world.getChunkProvider().addTicket(TicketType.PLUGIN, chunkPos, 1, Unit.INSTANCE);
|
|
+ world.getChunkProvider().addTicket(TicketType.PLUGIN, chunkPos, 0, Unit.INSTANCE); // Paper
|
|
world.getChunkAt(x, z); // make sure we're at ticket level 32 or lower
|
|
return true;
|
|
}
|
|
@@ -597,7 +614,7 @@ public class CraftWorld implements World {
|
|
// we do this so we do not re-read the chunk data on disk
|
|
}
|
|
|
|
- world.getChunkProvider().addTicket(TicketType.PLUGIN, chunkPos, 1, Unit.INSTANCE);
|
|
+ world.getChunkProvider().addTicket(TicketType.PLUGIN, chunkPos, 0, Unit.INSTANCE); // Paper
|
|
world.getChunkProvider().getChunkAt(x, z, ChunkStatus.FULL, true);
|
|
return true;
|
|
// Paper end
|
|
@@ -2547,6 +2564,7 @@ public class CraftWorld implements World {
|
|
}
|
|
return this.world.getChunkProvider().getChunkAtAsynchronously(x, z, gen, urgent).thenComposeAsync((either) -> {
|
|
net.minecraft.world.level.chunk.Chunk chunk = (net.minecraft.world.level.chunk.Chunk) either.left().orElse(null);
|
|
+ if (chunk != null) addTicket(x, z); // Paper
|
|
return CompletableFuture.completedFuture(chunk == null ? null : chunk.getBukkitChunk());
|
|
}, net.minecraft.server.MinecraftServer.getServer());
|
|
}
|