Shift chunk key location in the correct direction (#2710)

This commit is contained in:
Spottedleaf 2019-12-01 05:33:57 -08:00 committed by Shane Freeder
parent 779f34cc37
commit b499d0d840

View file

@ -1,4 +1,4 @@
From e31205e58fdc02cb6102c7f710a61a1ff8499067 Mon Sep 17 00:00:00 2001
From 13d88336c734b2f4d7ec780cd4170c29bd517273 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
@ -7,7 +7,7 @@ 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 95e485ee..7b0424d5 100644
index 95e485eea..0bbef14a9 100644
--- a/src/main/java/org/bukkit/Chunk.java
+++ b/src/main/java/org/bukkit/Chunk.java
@@ -27,6 +27,32 @@ public interface Chunk {
@ -27,7 +27,7 @@ index 95e485ee..7b0424d5 100644
+ * @return Location's chunk coordinates packed into a long
+ */
+ static long getChunkKey(@NotNull Location loc) {
+ return getChunkKey((int) Math.floor(loc.getX()) << 4, (int) Math.floor(loc.getZ()) << 4);
+ return getChunkKey((int) Math.floor(loc.getX()) >> 4, (int) Math.floor(loc.getZ()) >> 4);
+ }
+
+ /**
@ -44,7 +44,7 @@ index 95e485ee..7b0424d5 100644
* 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 59cfe1ce..00a542f8 100644
index 98f416455..b80b8b3b6 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -158,6 +158,22 @@ public interface World extends PluginMessageRecipient, Metadatable {
@ -71,5 +71,5 @@ index 59cfe1ce..00a542f8 100644
* Checks if the specified {@link Chunk} is loaded
*
--
2.23.0
2.24.0