Sulkta-Coop/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix null handling in getLoadedChunkAsync for paper/spigot 1.21.3/1.21.4

Browse source
This commit is contained in:
Tom Cesko 2025-03-07 17:31:29 +01:00
parent 9e5e65bc8c
commit c785bd7430
2 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
bukkit-helper-121-3/src/main/java/org/dynmap/bukkit/helper/v121_3/MapChunkCache121_3.java
View file

@ -38,18 +38,15 @@ public class MapChunkCache121_3 extends GenericMapChunkCache {
@Override
protected Supplier<GenericChunk> getLoadedChunkAsync(DynmapChunk chunk) {
CompletableFuture<SerializableChunkData> chunkData = CompletableFuture.supplyAsync(() -> {
CompletableFuture<Optional<SerializableChunkData>> chunkData = CompletableFuture.supplyAsync(() -> {
CraftWorld cw = (CraftWorld) w;
Chunk c = cw.getHandle().getChunkIfLoaded(chunk.x, chunk.z);
if (c == null || !c.q) { //!c.loaded
return null;
if (c == null || !c.q) { // !c.loaded
return Optional.empty();
}
return SerializableChunkData.a(cw.getHandle(), c); //SerializableChunkData.copyOf
return Optional.of(SerializableChunkData.a(cw.getHandle(), c)); // SerializableChunkData.copyOf
}, ((CraftServer) Bukkit.getServer()).getServer());
return () -> {
NBTTagCompound nbt = chunkData.join().a(); // SerializableChunkData.write
return parseChunkFromNBT(new NBT.NBTCompound(nbt));
};
return () -> chunkData.join().map(SerializableChunkData::a).map(NBT.NBTCompound::new).map(this::parseChunkFromNBT).orElse(null); // SerializableChunkData::write
}
protected GenericChunk getLoadedChunk(DynmapChunk chunk) {

13
bukkit-helper-121-4/src/main/java/org/dynmap/bukkit/helper/v121_4/MapChunkCache121_4.java
View file

@ -38,18 +38,15 @@ public class MapChunkCache121_4 extends GenericMapChunkCache {
@Override
protected Supplier<GenericChunk> getLoadedChunkAsync(DynmapChunk chunk) {
CompletableFuture<SerializableChunkData> chunkData = CompletableFuture.supplyAsync(() -> {
CompletableFuture<Optional<SerializableChunkData>> chunkData = CompletableFuture.supplyAsync(() -> {
CraftWorld cw = (CraftWorld) w;
Chunk c = cw.getHandle().getChunkIfLoaded(chunk.x, chunk.z);
if (c == null || !c.q) { //!c.loaded
return null;
if (c == null || !c.q) { // !c.loaded
return Optional.empty();
}
return SerializableChunkData.a(cw.getHandle(), c); //SerializableChunkData.copyOf
return Optional.of(SerializableChunkData.a(cw.getHandle(), c)); // SerializableChunkData.copyOf
}, ((CraftServer) Bukkit.getServer()).getServer());
return () -> {
NBTTagCompound nbt = chunkData.join().a(); // SerializableChunkData.write
return parseChunkFromNBT(new NBT.NBTCompound(nbt));
};
return () -> chunkData.join().map(SerializableChunkData::a).map(NBT.NBTCompound::new).map(this::parseChunkFromNBT).orElse(null); // SerializableChunkData::write
}
protected GenericChunk getLoadedChunk(DynmapChunk chunk) {