mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-23 17:37:45 +01:00
05466e3b47
Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes:a9c796f1SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations195f071eSPIGOT-4219: Event for PigZombies angering.5e3082c7SPIGOT-4230: Improve legacy block types
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 35783dd499e0ca36931e371b18f56a03414bb1e0 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
|
|
index 54a605f9b9..f4dc7e4ac6 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
@@ -156,6 +156,27 @@ 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();
|
|
+ callback.onLoad(cps.getChunkAt(x, z).bukkitChunk); // TODO: Add back async variant
|
|
+ /*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) {
|
|
return this.world.getChunkProviderServer().getChunkAt(x, z).bukkitChunk;
|
|
}
|
|
--
|
|
2.18.0
|
|
|