45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
|
From 2f16be2d68ab57aac9b4568aa113b15f6b0d6af2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: cswhite2000 <18whitechristop@gmail.com>
|
||
|
|
Date: Tue, 21 Aug 2018 19:44:10 -0700
|
||
|
|
Subject: [PATCH] isChunkGenerated API
|
||
|
|
|
||
|
|
Resolves #1329
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||
|
|
index 0eba3df5..ad548590 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||
|
|
@@ -85,6 +85,12 @@ public class ChunkProviderServer implements IChunkProvider {
|
||
|
|
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // Paper start
|
||
|
|
+ public boolean isChunkGenerated(int x, int z) {
|
||
|
|
+ return this.chunks.containsKey(ChunkCoordIntPair.asLong(x, z)) || this.chunkLoader.chunkExists(x, z);
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
@Nullable
|
||
|
|
public Chunk getLoadedChunkAt(int i, int j) {
|
||
|
|
long k = ChunkCoordIntPair.a(i, j);
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
index 567e9acb..afb141c6 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
@@ -630,6 +630,12 @@ public class CraftWorld implements World {
|
||
|
|
return getChunkAt(location.getBlockX() >> 4, location.getBlockZ() >> 4);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // Paper start
|
||
|
|
+ public boolean isChunkGenerated(int x, int z) {
|
||
|
|
+ return this.getHandle().getChunkProviderServer().isChunkGenerated(x, z);
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
public ChunkGenerator getGenerator() {
|
||
|
|
return generator;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.18.0
|
||
|
|
|