spdis/voxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix _one of_ the race conditions when loading a chunk that is already loaded (this whole thing is horrifically bad and should be redone to clone active chunk sections instead)

Browse Source
This commit is contained in:
mcrcortex
2025-12-02 08:58:22 +10:00
parent 18b13370d8
commit e7deeed34e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/me/cortex/voxy/common/voxelization/WorldConversionFactory.java
View File

@@ -59,7 +59,8 @@ public class WorldConversionFactory {
} }
return false; return false;
} }
private static void setupLocalPalette(Palette<BlockState> vp, Reference2IntOpenHashMap<BlockState> blockCache, Mapper mapper, int[] pc) { private static int setupLocalPalette(Palette<BlockState> vp, Reference2IntOpenHashMap<BlockState> blockCache, Mapper mapper, int[] pc) {
int c = vp.getSize();
if (vp instanceof LinearPalette<BlockState>) { if (vp instanceof LinearPalette<BlockState>) {
for (int i = 0; i < vp.getSize(); i++) { for (int i = 0; i < vp.getSize(); i++) {
var state = vp.valueFor(i); var state = vp.valueFor(i);
@@ -107,6 +108,7 @@ public class WorldConversionFactory {
throw new IllegalStateException("Unknown palette type: " + vp); throw new IllegalStateException("Unknown palette type: " + vp);
} }
} }
return c;
} }
public static VoxelizedSection convert(VoxelizedSection section, public static VoxelizedSection convert(VoxelizedSection section,
@@ -128,10 +130,13 @@ public class WorldConversionFactory {
var pc = cache.getPaletteCache(vp.getSize()); var pc = cache.getPaletteCache(vp.getSize());
GlobalPalette<BlockState> bps = null; GlobalPalette<BlockState> bps = null;
int pcc = 0;
if (blockContainer.data.palette instanceof GlobalPalette<BlockState> _bps) { if (blockContainer.data.palette instanceof GlobalPalette<BlockState> _bps) {
bps = _bps; bps = _bps;
pcc = bps.getSize();
} else { } else {
setupLocalPalette(vp, blockCache, stateMapper, pc); pcc = setupLocalPalette(vp, blockCache, stateMapper, pc);
pcc = Math.max(0,pcc-1);
} }
{ {
@@ -164,7 +169,7 @@ public class WorldConversionFactory {
} }
int bId; int bId;
if (bps == null) { if (bps == null) {
bId = pc[(int) (sample & MSK)]; bId = pc[Math.min((int) (sample & MSK), pcc)];
} else { } else {
bId = stateMapper.getIdForBlockState(bps.valueFor((int) (sample&MSK))); bId = stateMapper.getIdForBlockState(bps.valueFor((int) (sample&MSK)));
} }