69 lines
2.5 KiB
Diff
69 lines
2.5 KiB
Diff
From b036cb38ebab110e948775363f38ffb16c149199 Mon Sep 17 00:00:00 2001
|
|
From: cswhite2000 <18whitechristop@gmail.com>
|
|
Date: Tue, 21 Aug 2018 19:39:46 -0700
|
|
Subject: [PATCH] isChunkGenerated API
|
|
|
|
Resolves #1329
|
|
|
|
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
|
|
index 7e1ee875..9457832b 100644
|
|
--- a/src/main/java/org/bukkit/Location.java
|
|
+++ b/src/main/java/org/bukkit/Location.java
|
|
@@ -9,6 +9,7 @@ import org.bukkit.util.NumberConversions;
|
|
import org.bukkit.util.Vector;
|
|
|
|
// Paper start
|
|
+import com.google.common.base.Preconditions;
|
|
import java.util.Collection;
|
|
import java.util.function.Predicate;
|
|
import org.bukkit.entity.Entity;
|
|
@@ -502,6 +503,15 @@ public class Location implements Cloneable, ConfigurationSerializable {
|
|
public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
|
|
|
|
// Paper start
|
|
+ /**
|
|
+ * 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 a6facc4b..d5058634 100644
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
+++ b/src/main/java/org/bukkit/World.java
|
|
@@ -210,6 +210,26 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
|
public default Chunk getChunkAt(long chunkKey) {
|
|
return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
|
|
}
|
|
+
|
|
+ /**
|
|
+ * Checks if a {@link Chunk} has been generated at the specified chunk key,
|
|
+ * which is the X and Z packed into a long.
|
|
+ *
|
|
+ * @param chunkKey The Chunk Key to look up the chunk by
|
|
+ * @return true if the chunk has been generated, otherwise false
|
|
+ */
|
|
+ public default boolean isChunkGenerated(long chunkKey) {
|
|
+ return isChunkGenerated((int) chunkKey, (int) (chunkKey >> 32));
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Checks if a {@link Chunk} has been generated at the given coordinates.
|
|
+ *
|
|
+ * @param x X-coordinate of the chunk
|
|
+ * @param z Z-coordinate of the chunk
|
|
+ * @return true if the chunk has been generated, otherwise false
|
|
+ */
|
|
+ public boolean isChunkGenerated(int x, int z);
|
|
// Paper end
|
|
|
|
/**
|
|
--
|
|
2.18.0
|
|
|