58 Zeilen
2.0 KiB
Diff
58 Zeilen
2.0 KiB
Diff
|
From fd3e920af22a4c66551ed2ff0d7d53a07be86dd0 Mon Sep 17 00:00:00 2001
|
||
|
|
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
|
||
|
|
index 079b9febe..c75bce07a 100644
|
||
|
|
--- a/src/main/java/org/bukkit/Chunk.java
|
||
|
|
+++ b/src/main/java/org/bukkit/Chunk.java
|
||
|
|
@@ -23,6 +23,15 @@ public interface Chunk {
|
||
|
|
*/
|
||
|
|
int getZ();
|
||
|
|
|
||
|
|
+ // Paper start
|
||
|
|
+ /**
|
||
|
|
+ * @return The Chunks X and Z coordinates packed into a long
|
||
|
|
+ */
|
||
|
|
+ default long getChunkKey() {
|
||
|
|
+ return (long) getX() & 0xffffffffL | ((long) getZ() & 0xffffffffL) << 32;
|
||
|
|
+ }
|
||
|
|
+ // 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
|
||
|
|
index f541107f7..7b166b213 100644
|
||
|
|
--- a/src/main/java/org/bukkit/World.java
|
||
|
|
+++ b/src/main/java/org/bukkit/World.java
|
||
|
|
@@ -166,6 +166,21 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||
|
|
*/
|
||
|
|
public Chunk getChunkAt(Block block);
|
||
|
|
|
||
|
|
+ // 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:
|
||
|
|
+ * long chunkKey = (long) chunkX & 0xffffffffL | ((long) chunkZ & 0xffffffffL) << 32;
|
||
|
|
+ *
|
||
|
|
+ * @param chunkKey The Chunk Key to look up the chunk by
|
||
|
|
+ * @return The chunk at the specified key
|
||
|
|
+ */
|
||
|
|
+ public default Chunk getChunkAt(long chunkKey) {
|
||
|
|
+ return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
/**
|
||
|
|
* Used by {@link World#getChunkAtAsync(Location,ChunkLoadCallback)} methods
|
||
|
|
* to request a {@link Chunk} to be loaded, with this callback receiving
|
||
|
|
--
|
||
|
|
2.18.0
|
||
|
|
|