Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-7989: Error loading very old chunks

Browse Source
This commit is contained in:
md_5 2024-12-26 17:04:55 +11:00
parent 76fd7c056d
commit c905a715e9
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nms-patches/net/minecraft/world/level/chunk/storage/IChunkLoader.patch
View File

@ -16,7 +16,7 @@
public class IChunkLoader implements AutoCloseable { public class IChunkLoader implements AutoCloseable {
public static final int LAST_MONOLYTH_STRUCTURE_DATA_VERSION = 1493; public static final int LAST_MONOLYTH_STRUCTURE_DATA_VERSION = 1493;
@@ -39,13 +48,57 @@ @@ -39,13 +48,56 @@
return this.worker.isOldChunkAround(chunkcoordintpair, i); return this.worker.isOldChunkAround(chunkcoordintpair, i);
} }
@ -25,7 +25,6 @@
+ private boolean check(ChunkProviderServer cps, int x, int z) { + private boolean check(ChunkProviderServer cps, int x, int z) {
+ ChunkCoordIntPair pos = new ChunkCoordIntPair(x, z); + ChunkCoordIntPair pos = new ChunkCoordIntPair(x, z);
+ if (cps != null) { + if (cps != null) {
+ com.google.common.base.Preconditions.checkState(org.bukkit.Bukkit.isPrimaryThread(), "primary thread");
+ if (cps.hasChunk(x, z)) { + if (cps.hasChunk(x, z)) {
+ return true; + return true;
+ } + }
@ -75,7 +74,7 @@
if (i < 1493) { if (i < 1493) {
nbttagcompound = DataFixTypes.CHUNK.update(this.fixerUpper, nbttagcompound, i, 1493); nbttagcompound = DataFixTypes.CHUNK.update(this.fixerUpper, nbttagcompound, i, 1493);
if (nbttagcompound.getCompound("Level").getBoolean("hasLegacyStructureData")) { if (nbttagcompound.getCompound("Level").getBoolean("hasLegacyStructureData")) {
@@ -70,7 +123,7 @@ @@ -70,7 +122,7 @@
} }
} }
@ -84,7 +83,7 @@
PersistentStructureLegacy persistentstructurelegacy = this.legacyStructureHandler; PersistentStructureLegacy persistentstructurelegacy = this.legacyStructureHandler;
if (persistentstructurelegacy == null) { if (persistentstructurelegacy == null) {
@@ -85,7 +138,7 @@ @@ -85,7 +137,7 @@
return persistentstructurelegacy; return persistentstructurelegacy;
} }