Backport World#isChunkGenerated

Author: P3ridot

patches/api/0051-Backport-World-isChunkGenerated.patch

@@ -0,0 +1,58 @@
+From 69935bebe7e9f1c6ea28dcf5aafa90b22676e495 Mon Sep 17 00:00:00 2001
+From: Peridot <[email protected]>
+Date: Sat, 5 Nov 2022 21:53:26 +0100
+Subject: [PATCH] Backport World#isChunkGenerated
+
+
+@@ -496,6 +496,26 @@ public class Location implements Cloneable, ConfigurationSerializable {
+     }
+ 
+     // Paper start
++    /**
++     * Check if a {@link Chunk} has been loaded at this location.
++     *
++     * @return true if the chunk has been loaded at this location
++     */
++    public boolean isChunkLoaded() {
++        Preconditions.checkNotNull(world, "Location has no world!");
++        return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4);
++    }
++
++    /**
++     * Checks if a {@link Chunk} has been generated at this location.
++     *
++     * @return true if a chunk has been generated at this location
++     */
++    public boolean isGenerated() {
++        Preconditions.checkNotNull(world, "Location has no world!");
++        return world.isChunkGenerated(locToBlock(x) >> 4, locToBlock(z) >> 4);
++    }
++
+     /**
+      * Sets the position of this Location and returns itself
+      *
+diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
+index f36906eb..74a52dd1 100644
+--- a/src/main/java/org/bukkit/World.java
++++ b/src/main/java/org/bukkit/World.java
+@@ -631,6 +631,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
+      */
+     public boolean isChunkLoaded(int x, int z);
+ 
++    // Titanium start - Backport #isChunkGenerated
++    /**
++     * Checks if the {@link Chunk} at the specified coordinates is generated
++     *
++     * @param x X-coordinate of the chunk
++     * @param z Z-coordinate of the chunk
++     * @return true if the chunk is generated, otherwise false
++     */
++    public boolean isChunkGenerated(int x, int z);
++    // Titanium end
++
+     /**
+      * Checks if the {@link Chunk} at the specified coordinates is loaded and
+      * in use by one or more players
+-- 
+2.38.1.windows.1
+

patches/server/0083-Implement-Paper-0378-Performance-improvement-for-Chu.patch

@@ -2,7 +2,7 @@ From b84a3455d052204bc3d438c9de04872e11d81d08 Mon Sep 17 00:00:00 2001
 From: wea_ondara <[email protected]>
 Date: Sat, 4 Jun 2022 13:02:23 +0200
 Subject: [PATCH] Implement [Paper-0378] Performance improvement for
- Chunk.getEntities Add
+ Chunk.getEntities by wea_oandra
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java

patches/server/0215-Backport-World-isChunkGenerated.patch

@@ -0,0 +1,52 @@
+From 0c6ee54229dc9e060ed5c44b6c4169b898996066 Mon Sep 17 00:00:00 2001
+From: Peridot <[email protected]>
+Date: Sat, 5 Nov 2022 21:53:17 +0100
+Subject: [PATCH] Backport World#isChunkGenerated
+
+
+diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+index 32b584440..3f648ff36 100644
+--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
++++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+@@ -41,6 +41,11 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
+         return region != null && region.chunkExists(i & 31, j & 31); // PaperSpigot
+     }
+     // CraftBukkit end
++    // Titanium start
++    public boolean chunkExists(int i, int j) {
++        return this.chunkExists(null, i, j);
++    }
++    // Titanium end
+ 
+     // CraftBukkit start - Add async variant, provide compatibility
+     public Chunk a(World world, int i, int j) throws IOException {
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+index be4a5fc3c..fac98d03f 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+@@ -149,6 +149,22 @@ public class CraftWorld implements World {
+         return world.chunkProviderServer.isChunkLoaded(x, z);
+     }
+ 
++    // Titanium start - Backport World#isChunkGenerated
++    @Override
++    public boolean isChunkGenerated(int x, int z) {
++        if (isChunkLoaded(x, z)) {
++            return true;
++        }
++
++        // Titanium start - add instanceof check
++        if (!(world.chunkProviderServer.chunkLoader instanceof ChunkRegionLoader)) {
++            return false;
++        }
++        // Titanium end
++        return ((ChunkRegionLoader) world.chunkProviderServer.chunkLoader).chunkExists(x, z);
++    }
++    // Titanium end
++
+     public Chunk[] getLoadedChunks() {
+         Object[] chunks = world.chunkProviderServer.chunks.values().toArray();
+         org.bukkit.Chunk[] craftChunks = new CraftChunk[chunks.length];
+-- 
+2.38.1.windows.1
+