mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-19 05:00:24 +01:00
8c5b837e05
Firstly, the old methods all routed to the CompletableFuture method. However, the CF method could not guarantee that if the caller was off-main that the future would be "completed" on-main. Since the callback methods used the CF one, this meant that the callback methods did not guarantee that the callbacks were to be called on the main thread. Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb) so that the methods with the callback are guaranteed to invoke the callback on the main thread. The CF behavior remains unchanged; it may still appear to complete on main if invoked off-main. Secondly, remove the scheduleOnMain invocation in the async chunk completion. This unnecessarily delays the callback by 1 tick. Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which will load chunks within an area. This method is provided as a helper as keeping all chunks loaded within an area can be complicated to implement for plugins (due to the lacking ticket API), and is already implemented internally anyways. Fourthly, remove the ticket addition that occured with getChunkAt and getChunkAtAsync. The ticket addition may delay the unloading of the chunk unnecessarily. It also fixes a very rare timing bug where the future/callback would be completed after the chunk unloads.
54 lines
3.1 KiB
Diff
54 lines
3.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sat, 10 Dec 2022 17:52:38 -0800
|
|
Subject: [PATCH] Deprecate and replace methods with old StructureType
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index 8e0d8fafa68d909d1d10c6d6a03cca371c0e6fb3..ee79e3374b50ba21620a9685975a0341c15f313b 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -2007,6 +2007,11 @@ public final class CraftServer implements Server {
|
|
|
|
ServerLevel worldServer = ((CraftWorld) world).getHandle();
|
|
Location structureLocation = world.locateNearestStructure(location, structureType, radius, findUnexplored);
|
|
+ // Paper start - don't throw NPE
|
|
+ if (structureLocation == null) {
|
|
+ throw new IllegalStateException("Could not find a structure for " + structureType);
|
|
+ }
|
|
+ // Paper end
|
|
BlockPos structurePosition = CraftLocation.toBlockPosition(structureLocation);
|
|
|
|
// Create map with trackPlayer = true, unlimitedTracking = true
|
|
@@ -2017,6 +2022,31 @@ public final class CraftServer implements Server {
|
|
|
|
return CraftItemStack.asBukkitCopy(stack);
|
|
}
|
|
+ // Paper start - copied from above (uses un-deprecated StructureType type)
|
|
+ @Override
|
|
+ public ItemStack createExplorerMap(World world, Location location, org.bukkit.generator.structure.StructureType structureType, org.bukkit.map.MapCursor.Type mapIcon, int radius, boolean findUnexplored) {
|
|
+ Preconditions.checkArgument(world != null, "World cannot be null");
|
|
+ Preconditions.checkArgument(location != null, "Location cannot be null");
|
|
+ Preconditions.checkArgument(structureType != null, "StructureType cannot be null");
|
|
+ Preconditions.checkArgument(mapIcon != null, "mapIcon cannot be null");
|
|
+
|
|
+ ServerLevel worldServer = ((CraftWorld) world).getHandle();
|
|
+ final org.bukkit.util.StructureSearchResult structureSearchResult = world.locateNearestStructure(location, structureType, radius, findUnexplored);
|
|
+ if (structureSearchResult == null) {
|
|
+ return null;
|
|
+ }
|
|
+ Location structureLocation = structureSearchResult.getLocation();
|
|
+ BlockPos structurePosition = new BlockPos(structureLocation.getBlockX(), structureLocation.getBlockY(), structureLocation.getBlockZ());
|
|
+
|
|
+ // Create map with showIcons = true, unlimitedTracking = true
|
|
+ net.minecraft.world.item.ItemStack stack = MapItem.create(worldServer, structurePosition.getX(), structurePosition.getZ(), MapView.Scale.NORMAL.getValue(), true, true);
|
|
+ MapItem.renderBiomePreviewMap(worldServer, stack);
|
|
+ // "+" map ID taken from VillagerTrades$TreasureMapForEmeralds
|
|
+ MapItem.getSavedData(stack, worldServer).addTargetDecoration(stack, structurePosition, "+", CraftMapCursor.CraftType.bukkitToMinecraftHolder(mapIcon));
|
|
+
|
|
+ return CraftItemStack.asBukkitCopy(stack);
|
|
+ }
|
|
+ // Paper end
|
|
|
|
@Override
|
|
public void shutdown() {
|