2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-08-05 01:38:58 +02:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Sat, 4 Aug 2018 19:37:35 -0400
|
|
|
|
Subject: [PATCH] Provide Chunk Coordinates as a Long API
|
|
|
|
|
|
|
|
Allows you to easily access the chunks X/z as a long, and a method
|
|
|
|
to look up by the long key too.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
|
2020-05-06 11:48:49 +02:00
|
|
|
index 95e485eea693e7648e63d198c8591d89e02e6755..0bbef14a9fc2a3ec03b4db59c8d8e1eedc0ad1c1 100644
|
2018-08-05 01:38:58 +02:00
|
|
|
--- a/src/main/java/org/bukkit/Chunk.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Chunk.java
|
2019-09-10 20:51:02 +02:00
|
|
|
@@ -27,6 +27,32 @@ public interface Chunk {
|
2018-08-05 01:38:58 +02:00
|
|
|
*/
|
|
|
|
int getZ();
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ /**
|
|
|
|
+ * @return The Chunks X and Z coordinates packed into a long
|
|
|
|
+ */
|
|
|
|
+ default long getChunkKey() {
|
2018-09-21 22:56:08 +02:00
|
|
|
+ return getChunkKey(getX(), getZ());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * @param loc Location to get chunk key
|
|
|
|
+ * @return Location's chunk coordinates packed into a long
|
|
|
|
+ */
|
2019-03-20 01:28:15 +01:00
|
|
|
+ static long getChunkKey(@NotNull Location loc) {
|
2019-12-01 14:33:57 +01:00
|
|
|
+ return getChunkKey((int) Math.floor(loc.getX()) >> 4, (int) Math.floor(loc.getZ()) >> 4);
|
2018-09-21 22:56:08 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * @param x X Coordinate
|
|
|
|
+ * @param z Z Coordinate
|
|
|
|
+ * @return Chunk coordinates packed into a long
|
|
|
|
+ */
|
|
|
|
+ static long getChunkKey(int x, int z) {
|
|
|
|
+ return (long) x & 0xffffffffL | ((long) z & 0xffffffffL) << 32;
|
2018-08-05 01:38:58 +02:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
/**
|
|
|
|
* Gets the world containing this chunk
|
|
|
|
*
|
|
|
|
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
2020-06-25 11:27:25 +02:00
|
|
|
index f321f7a3b7afc3969edf2675a7872ffe31fb657f..008fb638b5b0601109c72c322caa7669403ae273 100644
|
2018-08-05 01:38:58 +02:00
|
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
|
|
+++ b/src/main/java/org/bukkit/World.java
|
2020-03-26 03:37:20 +01:00
|
|
|
@@ -207,6 +207,22 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
2019-03-20 01:28:15 +01:00
|
|
|
@NotNull
|
|
|
|
public Chunk getChunkAt(@NotNull Block block);
|
2018-08-05 01:38:58 +02:00
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ /**
|
|
|
|
+ * Gets the chunk at the specified chunk key, which is the X and Z packed into a long.
|
|
|
|
+ *
|
|
|
|
+ * See {@link Chunk#getChunkKey()} for easy access to the key, or you may calculate it as:
|
2018-08-16 13:20:58 +02:00
|
|
|
+ * long chunkKey = (long) chunkX & 0xffffffffL | ((long) chunkZ & 0xffffffffL) >> 32;
|
2018-08-05 01:38:58 +02:00
|
|
|
+ *
|
|
|
|
+ * @param chunkKey The Chunk Key to look up the chunk by
|
|
|
|
+ * @return The chunk at the specified key
|
|
|
|
+ */
|
2019-03-20 01:28:15 +01:00
|
|
|
+ @NotNull
|
2018-08-05 01:38:58 +02:00
|
|
|
+ public default Chunk getChunkAt(long chunkKey) {
|
|
|
|
+ return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
/**
|
2018-09-21 22:56:08 +02:00
|
|
|
* Checks if the specified {@link Chunk} is loaded
|
|
|
|
*
|