diff options
Diffstat (limited to 'patches/server/0661-Use-getChunkIfLoadedImmediately-in-places.patch')
-rw-r--r-- | patches/server/0661-Use-getChunkIfLoadedImmediately-in-places.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/patches/server/0661-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0661-Use-getChunkIfLoadedImmediately-in-places.patch new file mode 100644 index 0000000000..aabc626bc4 --- /dev/null +++ b/patches/server/0661-Use-getChunkIfLoadedImmediately-in-places.patch @@ -0,0 +1,49 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Spottedleaf <[email protected]> +Date: Mon, 8 Jul 2019 00:13:36 -0700 +Subject: [PATCH] Use getChunkIfLoadedImmediately in places + +This prevents us from hitting chunk loads for chunks at or less-than +ticket level 33 (yes getChunkIfLoaded will actually perform a chunk +load in that case). + +diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java +index cb4e720d25cd71c4094e476732b519a0a6ff2b27..10abc211d4b5688de95066caccc7486acafd2858 100644 +--- a/src/main/java/net/minecraft/server/level/ServerLevel.java ++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java +@@ -223,7 +223,7 @@ public class ServerLevel extends Level implements WorldGenLevel { + } + + @Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI +- return this.chunkSource.getChunk(x, z, false); ++ return this.chunkSource.getChunkAtIfLoadedImmediately(x, z); // Paper + } + + @Override +@@ -1476,7 +1476,7 @@ public class ServerLevel extends Level implements WorldGenLevel { + + for (int l1 = j; l1 <= i1; ++l1) { + for (int i2 = l; i2 <= k1; ++i2) { +- LevelChunk chunk = this.getChunkSource().getChunkNow(l1, i2); ++ LevelChunk chunk = (LevelChunk) this.getChunkIfLoadedImmediately(l1, i2); // Paper + + if (chunk != null) { + for (int j2 = k; j2 <= j1; ++j2) { +diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java +index 15050e9bfbb5c5639a8b225a9beb3834aab4eafb..e30414e1a5e7907c59917c5cd182bca65bc65825 100644 +--- a/src/main/java/net/minecraft/world/level/Level.java ++++ b/src/main/java/net/minecraft/world/level/Level.java +@@ -199,6 +199,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { + return (CraftServer) Bukkit.getServer(); + } + ++ // Paper start ++ @Override ++ public boolean hasChunk(int chunkX, int chunkZ) { ++ return this.getChunkIfLoaded(chunkX, chunkZ) != null; ++ } ++ // Paper end ++ + public abstract ResourceKey<LevelStem> getTypeKey(); + + protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor |