2018-07-21 22:55:43 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Sat, 21 Jul 2018 16:55:04 -0400
|
|
|
|
Subject: [PATCH] Add async chunk load API
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2018-08-26 20:11:49 +02:00
|
|
|
index e4c4cdb980..af977b171a 100644
|
2018-07-21 22:55:43 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
@@ -0,0 +0,0 @@ public class CraftWorld implements World {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start - Async chunk load API
|
|
|
|
+ public void getChunkAtAsync(final int x, final int z, final ChunkLoadCallback callback) {
|
|
|
|
+ final ChunkProviderServer cps = this.world.getChunkProviderServer();
|
2018-08-26 20:11:49 +02:00
|
|
|
+ callback.onLoad(cps.getChunkAt(x, z, true, true).bukkitChunk); // TODO: Add back async variant
|
2018-07-21 22:55:43 +02:00
|
|
|
+ /*cps.getChunkAt(x, z, new Runnable() {
|
|
|
|
+ @Override
|
|
|
|
+ public void run() {
|
|
|
|
+ callback.onLoad(cps.getChunkAt(x, z).bukkitChunk);
|
|
|
|
+ }
|
|
|
|
+ });*/
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void getChunkAtAsync(Block block, ChunkLoadCallback callback) {
|
|
|
|
+ getChunkAtAsync(block.getX() >> 4, block.getZ() >> 4, callback);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void getChunkAtAsync(Location location, ChunkLoadCallback callback) {
|
|
|
|
+ getChunkAtAsync(location.getBlockX() >> 4, location.getBlockZ() >> 4, callback);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
public Chunk getChunkAt(int x, int z) {
|
2018-08-26 20:11:49 +02:00
|
|
|
return this.world.getChunkProviderServer().getChunkAt(x, z, true, true).bukkitChunk;
|
2018-07-21 22:55:43 +02:00
|
|
|
}
|
|
|
|
--
|