mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[ci skip] Move chunk system patch back a bit

Browse source
This commit is contained in:
Nassim Jahnke 2024-01-24 13:07:40 +01:00
parent 51bef80755
commit ad2cf68a7f
No known key found for this signature in database
GPG key ID: EF6771C01F6EF02F
207 changed files with 892 additions and 869 deletions
Download patch file Download diff file Expand all files Collapse all files

8
patches/server/0395-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
View file

@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead
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 8bc0f2a7a4a5af73a4a0b693b91c6bbbf7c6e2d1..8b5fb5e5719ea1453751ef8f7bd97bca1af64ae8 100644
index 2b709a4e7b120497c48d0408874a29602ea5bd98..3aa481599811af7cd9b0c523f66dac469105ee49 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -377,7 +377,7 @@ public final class CraftServer implements Server {
@ -44,7 +44,7 @@ index 8bc0f2a7a4a5af73a4a0b693b91c6bbbf7c6e2d1..8b5fb5e5719ea1453751ef8f7bd97bca
this.printSaveWarning = false;
this.console.autosavePeriod = this.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 e8b06b5952e5cc63f82d7a0542bf931bd4b45d65..f248735d48aa5c430752426e9dc02c1ae6644aaf 100644
index 316ba3726f4bfe2e99edefa87bc0ff372a6389bc..fe0095601b41d85d8813af18e1c74b31f26f150d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -282,7 +282,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@ -84,7 +84,7 @@ index e8b06b5952e5cc63f82d7a0542bf931bd4b45d65..f248735d48aa5c430752426e9dc02c1a
}
return true;
@@ -435,7 +447,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -432,7 +444,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
}
if (chunk instanceof net.minecraft.world.level.chunk.LevelChunk) {
@ -93,7 +93,7 @@ index e8b06b5952e5cc63f82d7a0542bf931bd4b45d65..f248735d48aa5c430752426e9dc02c1a
return true;
}
@@ -2213,6 +2225,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2184,6 +2196,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
io.papermc.paper.chunk.system.ChunkSystem.scheduleChunkLoad(this.getHandle(), x, z, gen, ChunkStatus.FULL, true, priority, (c) -> {
net.minecraft.server.MinecraftServer.getServer().scheduleOnMain(() -> {
net.minecraft.world.level.chunk.LevelChunk chunk = (net.minecraft.world.level.chunk.LevelChunk)c;