From b697c4d506e643c7b6590e0ded33658b112ae1ff Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 6 Nov 2014 18:31:52 -0600 Subject: [PATCH] Add Async Chunk Load API --- .../0006-Add-async-chunk-load-API.patch | 29 ++++++++++++++ .../0046-Add-async-chunk-load-API.patch | 38 +++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 Spigot-API-Patches/0006-Add-async-chunk-load-API.patch create mode 100644 Spigot-Server-Patches/0046-Add-async-chunk-load-API.patch diff --git a/Spigot-API-Patches/0006-Add-async-chunk-load-API.patch b/Spigot-API-Patches/0006-Add-async-chunk-load-API.patch new file mode 100644 index 0000000..2bd3009 --- /dev/null +++ b/Spigot-API-Patches/0006-Add-async-chunk-load-API.patch @@ -0,0 +1,29 @@ +From 498f77bac894f37bb813f93a2d3da2c127a2384f Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Thu, 6 Nov 2014 18:29:20 -0600 +Subject: [PATCH] Add async chunk load API + + +diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java +index ab73174..c962e7d 100644 +--- a/src/main/java/org/bukkit/World.java ++++ b/src/main/java/org/bukkit/World.java +@@ -129,6 +129,15 @@ public interface World extends PluginMessageRecipient, Metadatable { + */ + public Chunk getChunkAt(Block block); + ++ // PaperSpigot start - Async chunk load API ++ public static interface ChunkLoadCallback { ++ public void onLoad(Chunk chunk); ++ } ++ public void getChunkAtAsync(int x, int z, ChunkLoadCallback cb); ++ public void getChunkAtAsync(Location location, ChunkLoadCallback cb); ++ public void getChunkAtAsync(Block block, ChunkLoadCallback cb); ++ // PaperSpigot end ++ + /** + * Checks if the specified {@link Chunk} is loaded + * +-- +1.9.1 + diff --git a/Spigot-Server-Patches/0046-Add-async-chunk-load-API.patch b/Spigot-Server-Patches/0046-Add-async-chunk-load-API.patch new file mode 100644 index 0000000..796beb9 --- /dev/null +++ b/Spigot-Server-Patches/0046-Add-async-chunk-load-API.patch @@ -0,0 +1,38 @@ +From b3f12462780511ff56a4d5d6b5049bdffc46464e Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Thu, 6 Nov 2014 18:29:20 -0600 +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 +index d67ba8f..4b3f828 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +@@ -117,6 +117,24 @@ public class CraftWorld implements World { + } + } + ++ // PaperSpigot start - Async chunk load API ++ public void getChunkAtAsync(final int x, final int z, final ChunkLoadCallback callback) { ++ final ChunkProviderServer cps = this.world.chunkProviderServer; ++ 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); ++ } ++ // PaperSpigot end ++ + public Chunk getChunkAt(int x, int z) { + return this.world.chunkProviderServer.getChunkAt(x, z).bukkitChunk; + } +-- +1.9.1 +