2021-07-02 21:04:29 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
|
|
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
|
2024-01-19 13:22:30 +01:00
|
|
|
index b858ee2fc8c03c52a6b6d703b1f770b3c496b2a8..45d5e5bd1ed37c4a3a658b27dc8571344580b65b 100644
|
2021-07-02 21:04:29 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
2024-01-12 21:58:54 +01:00
|
|
|
@@ -229,7 +229,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
2021-07-02 21:04:29 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@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);
|
2024-01-19 13:22:30 +01:00
|
|
|
+ return this.chunkSource.getChunkAtIfLoadedImmediately(x, z); // Paper - Use getChunkIfLoadedImmediately
|
2021-07-02 21:04:29 +02:00
|
|
|
}
|
|
|
|
|
2021-11-25 00:26:29 +01:00
|
|
|
@Override
|
2021-07-02 21:04:29 +02:00
|
|
|
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 13:22:30 +01:00
|
|
|
index 761d01c993b60a11c749e172c3ee3067c055b582..2069cad866a3fd2ed5512fa8fc6dc2ef8bc9758e 100644
|
2021-07-02 21:04:29 +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 04:57:46 +01:00
|
|
|
@@ -204,6 +204,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
2021-07-02 21:04:29 +02:00
|
|
|
return (CraftServer) Bukkit.getServer();
|
|
|
|
}
|
|
|
|
|
2024-01-19 13:22:30 +01:00
|
|
|
+ // Paper start - Use getChunkIfLoadedImmediately
|
2021-07-02 21:04:29 +02:00
|
|
|
+ @Override
|
|
|
|
+ public boolean hasChunk(int chunkX, int chunkZ) {
|
2021-11-25 00:26:29 +01:00
|
|
|
+ return this.getChunkIfLoaded(chunkX, chunkZ) != null;
|
2021-07-02 21:04:29 +02:00
|
|
|
+ }
|
2024-01-19 13:22:30 +01:00
|
|
|
+ // Paper end - Use getChunkIfLoadedImmediately
|
2021-07-02 21:04:29 +02:00
|
|
|
+
|
2021-11-25 00:26:29 +01:00
|
|
|
public abstract ResourceKey<LevelStem> getTypeKey();
|
|
|
|
|
2024-01-13 21:31:02 +01:00
|
|
|
protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, 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 - create paper world config; Async-Anti-Xray: Pass executor
|
2022-12-07 21:16:54 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/gameevent/GameEventDispatcher.java b/src/main/java/net/minecraft/world/level/gameevent/GameEventDispatcher.java
|
2024-01-19 13:22:30 +01:00
|
|
|
index 0d5ae91a9b43df7b412968ab5faf5498c09169f9..37ae0f928440af5b2fdfe68ad6c9c54e8c95c82c 100644
|
2022-12-07 21:16:54 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/gameevent/GameEventDispatcher.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/gameevent/GameEventDispatcher.java
|
2023-09-21 18:48:55 +02:00
|
|
|
@@ -55,7 +55,7 @@ public class GameEventDispatcher {
|
2022-12-07 21:16:54 +01:00
|
|
|
|
|
|
|
for (int l1 = j; l1 <= i1; ++l1) {
|
|
|
|
for (int i2 = l; i2 <= k1; ++i2) {
|
|
|
|
- LevelChunk chunk = this.level.getChunkSource().getChunkNow(l1, i2);
|
2024-01-19 13:22:30 +01:00
|
|
|
+ LevelChunk chunk = (LevelChunk) this.level.getChunkIfLoadedImmediately(l1, i2); // Paper - Use getChunkIfLoadedImmediately
|
2022-12-07 21:16:54 +01:00
|
|
|
|
|
|
|
if (chunk != null) {
|
|
|
|
for (int j2 = k; j2 <= j1; ++j2) {
|