2019-05-27 00:16:47 +00:00
|
|
|
From 97b715a164d05940fbea66bcf2c578d1c07133eb Mon Sep 17 00:00:00 2001
|
2019-05-06 19:30:27 +00:00
|
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
|
|
Date: Mon, 6 May 2019 12:29:24 -0700
|
|
|
|
Subject: [PATCH] Async Chunk placeholder
|
|
|
|
|
|
|
|
Until we figure out Mojang's ticket system.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2019-05-26 01:56:30 +00:00
|
|
|
index 174d2d4ea0..88d179342f 100644
|
2019-05-06 19:30:27 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
@@ -14,6 +14,7 @@ import java.util.Objects;
|
|
|
|
import java.util.Random;
|
|
|
|
import java.util.Set;
|
|
|
|
import java.util.UUID;
|
|
|
|
+import java.util.concurrent.CompletableFuture;
|
|
|
|
import java.util.function.Predicate;
|
|
|
|
import net.minecraft.server.AxisAlignedBB;
|
|
|
|
import net.minecraft.server.BiomeBase;
|
2019-05-26 01:56:30 +00:00
|
|
|
@@ -2117,6 +2118,17 @@ public class CraftWorld implements World {
|
2019-05-06 19:30:27 +00:00
|
|
|
return (nearest == null) ? null : new Location(this, nearest.getX(), nearest.getY(), nearest.getZ());
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen) {
|
|
|
|
+ // TODO placeholder
|
|
|
|
+ CompletableFuture<Chunk> ret = new CompletableFuture<>();
|
|
|
|
+ ret.complete(getChunkAt(x, z));
|
|
|
|
+ return ret;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
// Spigot start
|
|
|
|
private final Spigot spigot = new Spigot()
|
|
|
|
{
|
|
|
|
--
|
|
|
|
2.21.0
|
|
|
|
|