SteamWar/FastAsyncWorldEdit
13
0
Fork 0
geforkt von Mirrors/FastAsyncWorldEdit
Code Issues Pull-Requests Pakete Projekte Releases Wiki Aktivität

fix: update to changes to spigot chunk future result (#2934)

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Jordan 2024-09-29 18:27:53 +01:00 committet von GitHub
Ursprung cc2f6459f9
Commit 631269cafe
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: B5690EEEBB952194
2 geänderte Dateien mit 4 neuen und 14 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

9
worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightPlatformAdapter.java
Datei anzeigen

@ -357,14 +357,9 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
LevelChunk levelChunk; LevelChunk levelChunk;
if (PaperLib.isPaper()) { if (PaperLib.isPaper()) {
// getChunkAtIfLoadedImmediately is paper only // getChunkAtIfLoadedImmediately is paper only
levelChunk = nmsWorld levelChunk = nmsWorld.getChunkSource().getChunkAtIfLoadedImmediately(chunkX, chunkZ);
.getChunkSource()
.getChunkAtIfLoadedImmediately(chunkX, chunkZ);
} else { } else {
levelChunk = ((Optional<LevelChunk>) ((Either) chunkHolder levelChunk = chunkHolder.getTickingChunkFuture().getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK).orElse(null);
.getTickingChunkFuture() // method is not present with new paper chunk system
.getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK)).left())
.orElse(null);
} }
if (levelChunk == null) { if (levelChunk == null) {
return; return;

9
worldedit-bukkit/adapters/adapter-1_21/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightPlatformAdapter.java
Datei anzeigen

@ -341,14 +341,9 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
LevelChunk levelChunk; LevelChunk levelChunk;
if (PaperLib.isPaper()) { if (PaperLib.isPaper()) {
// getChunkAtIfLoadedImmediately is paper only // getChunkAtIfLoadedImmediately is paper only
levelChunk = nmsWorld levelChunk = nmsWorld.getChunkSource().getChunkAtIfLoadedImmediately(chunkX, chunkZ);
.getChunkSource()
.getChunkAtIfLoadedImmediately(chunkX, chunkZ);
} else { } else {
levelChunk = ((Optional<LevelChunk>) ((Either) chunkHolder levelChunk = chunkHolder.getTickingChunkFuture().getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK).orElse(null);
.getTickingChunkFuture() // method is not present with new paper chunk system
.getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK)).left())
.orElse(null);
} }
if (levelChunk == null) { if (levelChunk == null) {
return; return;