2022-07-30 01:16:26 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
|
|
Date: Fri, 29 Jul 2022 12:35:19 -0400
|
|
|
|
Subject: [PATCH] Warn on plugins accessing faraway chunks
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
2024-01-19 12:30:04 +01:00
|
|
|
index 15200db3bc2fde3858d55156b039996366e72dd4..2ef137e93f88b98812fc5b2c36f32d7d7b4216ae 100644
|
2022-07-30 01:16:26 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/Level.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
2023-12-06 17:21:56 +01:00
|
|
|
@@ -813,7 +813,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
2022-07-30 01:16:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
private static boolean isInWorldBoundsHorizontal(BlockPos pos) {
|
|
|
|
- return pos.getX() >= -30000000 && pos.getZ() >= -30000000 && pos.getX() < 30000000 && pos.getZ() < 30000000;
|
2024-01-18 15:56:25 +01:00
|
|
|
+ return pos.getX() >= -30000000 && pos.getZ() >= -30000000 && pos.getX() < 30000000 && pos.getZ() < 30000000; // Diff on change warnUnsafeChunk()
|
2022-07-30 01:16:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
private static boolean isOutsideSpawnableHeight(int y) {
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2024-01-19 12:30:04 +01:00
|
|
|
index 75e573ef6e211c1a7fe6168595179eccdb8fd4d2..56a98b297f3f8742d400cd3a1f335cec1d50b331 100644
|
2022-07-30 01:16:26 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2023-12-25 23:51:56 +01:00
|
|
|
@@ -312,9 +312,24 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2022-07-30 01:16:26 +02:00
|
|
|
public boolean setSpawnLocation(int x, int y, int z) {
|
|
|
|
return this.setSpawnLocation(x, y, z, 0.0F);
|
|
|
|
}
|
|
|
|
+ // Paper start
|
|
|
|
+ private static void warnUnsafeChunk(String reason, int x, int z) {
|
|
|
|
+ // if any chunk coord is outside of 30 million blocks
|
|
|
|
+ if (x > 1875000 || z > 1875000 || x < -1875000 || z < -1875000) {
|
|
|
|
+ Plugin plugin = io.papermc.paper.util.StackWalkerUtil.getFirstPluginCaller();
|
|
|
|
+ if (plugin != null) {
|
|
|
|
+ plugin.getLogger().warning("Plugin is %s at (%s, %s), this might cause issues.".formatted(reason, x, z));
|
|
|
|
+ }
|
|
|
|
+ if (net.minecraft.server.MinecraftServer.getServer().isDebugging()) {
|
|
|
|
+ io.papermc.paper.util.TraceUtil.dumpTraceForThread("Dangerous chunk retrieval");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public Chunk getChunkAt(int x, int z) {
|
|
|
|
+ warnUnsafeChunk("getting a faraway chunk", x, z); // Paper
|
|
|
|
// Paper start - add ticket to hold chunk for a little while longer if plugin accesses it
|
2023-04-07 20:39:13 +02:00
|
|
|
net.minecraft.world.level.chunk.LevelChunk chunk = this.world.getChunkSource().getChunkAtIfLoadedImmediately(x, z);
|
2022-07-30 01:16:26 +02:00
|
|
|
if (chunk == null) {
|
2023-12-25 23:51:56 +01:00
|
|
|
@@ -429,6 +444,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2022-07-30 01:16:26 +02:00
|
|
|
@Override
|
|
|
|
public boolean regenerateChunk(int x, int z) {
|
|
|
|
org.spigotmc.AsyncCatcher.catchOp("chunk regenerate"); // Spigot
|
|
|
|
+ warnUnsafeChunk("regenerating a faraway chunk", x, z); // Paper
|
|
|
|
// Paper start - implement regenerateChunk method
|
|
|
|
final ServerLevel serverLevel = this.world;
|
|
|
|
final net.minecraft.server.level.ServerChunkCache serverChunkCache = serverLevel.getChunkSource();
|
2023-12-25 23:51:56 +01:00
|
|
|
@@ -524,6 +540,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2022-07-30 01:16:26 +02:00
|
|
|
@Override
|
|
|
|
public boolean loadChunk(int x, int z, boolean generate) {
|
|
|
|
org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot
|
|
|
|
+ warnUnsafeChunk("loading a faraway chunk", x, z); // Paper
|
|
|
|
// Paper start - Optimize this method
|
|
|
|
ChunkPos chunkPos = new ChunkPos(x, z);
|
|
|
|
ChunkAccess immediate = world.getChunkSource().getChunkAtIfLoadedImmediately(x, z); // Paper
|
2023-12-25 23:51:56 +01:00
|
|
|
@@ -587,6 +604,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2022-07-30 01:16:26 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public boolean addPluginChunkTicket(int x, int z, Plugin plugin) {
|
|
|
|
+ warnUnsafeChunk("adding a faraway chunk ticket", x, z); // Paper
|
|
|
|
Preconditions.checkArgument(plugin != null, "null plugin");
|
|
|
|
Preconditions.checkArgument(plugin.isEnabled(), "plugin is not enabled");
|
|
|
|
|
2023-12-25 23:51:56 +01:00
|
|
|
@@ -655,6 +673,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2022-07-30 01:16:26 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public void setChunkForceLoaded(int x, int z, boolean forced) {
|
|
|
|
+ warnUnsafeChunk("forceloading a faraway chunk", x, z); // Paper
|
|
|
|
this.getHandle().setChunkForced(x, z, forced);
|
|
|
|
}
|
|
|
|
|
2023-12-25 23:51:56 +01:00
|
|
|
@@ -967,6 +986,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2022-07-30 01:16:26 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public int getHighestBlockYAt(int x, int z, org.bukkit.HeightMap heightMap) {
|
|
|
|
+ warnUnsafeChunk("getting a faraway chunk", x >> 4, z >> 4); // Paper
|
|
|
|
// Transient load for this tick
|
|
|
|
return this.world.getChunk(x >> 4, z >> 4).getHeight(CraftHeightMap.toNMS(heightMap), x, z);
|
|
|
|
}
|
2024-01-14 10:46:04 +01:00
|
|
|
@@ -2415,6 +2435,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2022-09-01 18:51:59 +02:00
|
|
|
// Spigot end
|
2022-07-30 01:16:26 +02:00
|
|
|
// Paper start
|
|
|
|
public java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen, boolean urgent) {
|
|
|
|
+ warnUnsafeChunk("getting a faraway chunk async", x, z); // Paper
|
|
|
|
if (Bukkit.isPrimaryThread()) {
|
|
|
|
net.minecraft.world.level.chunk.LevelChunk immediate = this.world.getChunkSource().getChunkAtIfLoadedImmediately(x, z);
|
|
|
|
if (immediate != null) {
|