58 lines
2.4 KiB
Diff
58 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 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
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
|
|
index 07e532cde37255ffb2db368453bb69ee0a410931..6e1a1124a6e528c1a94ccb1d09bc5dccf056b0b8 100644
|
|
--- a/src/main/java/org/bukkit/Location.java
|
|
+++ b/src/main/java/org/bukkit/Location.java
|
|
@@ -3,6 +3,7 @@ package org.bukkit;
|
|
import com.google.common.base.Preconditions;
|
|
import java.lang.ref.Reference;
|
|
import java.lang.ref.WeakReference;
|
|
+import com.google.common.base.Preconditions; // Paper
|
|
import java.util.HashMap;
|
|
import java.util.Map;
|
|
import org.bukkit.block.Block;
|
|
@@ -545,6 +546,16 @@ public class Location implements Cloneable, ConfigurationSerializable {
|
|
public boolean isChunkLoaded() { return this.getWorld().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() {
|
|
+ World world = this.getWorld();
|
|
+ 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 64308c1f05747c2320ae5dc86f602c3d93e9d855..b7ad4f566497914573ccfb595e660226dd34c273 100644
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
+++ b/src/main/java/org/bukkit/World.java
|
|
@@ -254,6 +254,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
|
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));
|
|
+ }
|
|
+
|
|
/**
|
|
* This is the Legacy API before Java 8 was supported. Java 8 Consumer is provided,
|
|
* as well as future support
|