Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-22 08:11:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix World#getChunkAtAsync(Location) variants incorectly calculating chunk x

Browse Source 
The blockX needs to be floored before converted to int, as float -> integer
operations are truncation. (i.e -0.5 -> 0, we want -0.5 -> -1)
This commit is contained in:
Spottedleaf 2019-03-02 15:45:42 -08:00
parent 7af07de57b
commit e98c779a36
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-API-Patches/Async-Chunks-API.patch
View File

@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously.
Also adds utility methods to Entity to teleport asynchronously. Also adds utility methods to Entity to teleport asynchronously.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 807bd7fc..61f2cd9a 100644 index 807bd7fc..51cf7fd3 100644
--- a/src/main/java/org/bukkit/World.java --- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
@ -175,7 +175,7 @@ index 807bd7fc..61f2cd9a 100644
+ * will be executed synchronously + * will be executed synchronously
+ */ + */
+ public default void getChunkAtAsync(Location loc, java.util.function.Consumer<Chunk> cb) { + public default void getChunkAtAsync(Location loc, java.util.function.Consumer<Chunk> cb) {
+ getChunkAtAsync((int)loc.getX() >> 4, (int)Math.floor(loc.getZ()) >> 4, true, cb); + getChunkAtAsync((int)Math.floor(loc.getX()) >> 4, (int)Math.floor(loc.getZ()) >> 4, true, cb);
+ } + }
+ +
+ /** + /**
@ -197,7 +197,7 @@ index 807bd7fc..61f2cd9a 100644
+ * will be executed synchronously + * will be executed synchronously
+ */ + */
+ public default void getChunkAtAsync(Location loc, boolean gen, java.util.function.Consumer<Chunk> cb) { + public default void getChunkAtAsync(Location loc, boolean gen, java.util.function.Consumer<Chunk> cb) {
+ getChunkAtAsync((int)loc.getX() >> 4, (int)Math.floor(loc.getZ()) >> 4, gen, cb); + getChunkAtAsync((int)Math.floor(loc.getX()) >> 4, (int)Math.floor(loc.getZ()) >> 4, gen, cb);
+ } + }
+ +
+ /** + /**
@ -259,7 +259,7 @@ index 807bd7fc..61f2cd9a 100644
+ * @return Future that will resolve when the chunk is loaded + * @return Future that will resolve when the chunk is loaded
+ */ + */
+ public default java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(Location loc) { + public default java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(Location loc) {
+ return getChunkAtAsync((int)loc.getX() >> 4, (int)Math.floor(loc.getZ()) >> 4, true); + return getChunkAtAsync((int)Math.floor(loc.getX()) >> 4, (int)Math.floor(loc.getZ()) >> 4, true);
+ } + }
+ +
+ /** + /**
@ -279,7 +279,7 @@ index 807bd7fc..61f2cd9a 100644
+ * @return Future that will resolve when the chunk is loaded + * @return Future that will resolve when the chunk is loaded
+ */ + */
+ public default java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(Location loc, boolean gen) { + public default java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(Location loc, boolean gen) {
+ return getChunkAtAsync((int)loc.getX() >> 4, (int)Math.floor(loc.getZ()) >> 4, gen); + return getChunkAtAsync((int)Math.floor(loc.getX()) >> 4, (int)Math.floor(loc.getZ()) >> 4, gen);
+ } + }
+ +
+ /** + /**