Add an assert to world gen and minor reformat FullDataMetaFile

This commit is contained in:
James Seibel
2023-10-19 21:45:05 -05:00
parent fa03336a5d
commit 363a1aea4d
2 changed files with 6 additions and 4 deletions
@@ -620,8 +620,8 @@ public class FullDataMetaFile extends AbstractMetaDataContainerFile implements I
{
// swap the write queue if it has queued chunks.
// Must be done in this order to ensure IWorldGenTaskTracker.isMemoryAddressValid() work properly. See IWorldGenTaskTracker.isMemoryAddressValid() for details.
boolean isEmpty = this.writeQueueRef.get().queue.isEmpty();
if (!isEmpty)
boolean queueIsEmpty = this.writeQueueRef.get().queue.isEmpty();
if (!queueIsEmpty)
{
this.swapWriteQueues();
for (ChunkSizedFullDataAccessor chunk : this.backWriteQueue.queue)
@@ -633,7 +633,7 @@ public class FullDataMetaFile extends AbstractMetaDataContainerFile implements I
//LOGGER.info("Updated Data file at {} for sect {} with {} chunk writes.", path, pos, count);
}
return !isEmpty || !this.doesDtoExist;
return !queueIsEmpty || !this.doesDtoExist;
}
private void swapWriteQueues()
{
@@ -436,7 +436,9 @@ public class WorldGenerationQueue implements IWorldGenerationQueue, IDebugRender
try
{
IChunkWrapper chunk = SingletonInjector.INSTANCE.get(IWrapperFactory.class).createChunkWrapper(generatedObjectArray);
chunkDataConsumer.accept(LodDataBuilder.createChunkData(chunk));
ChunkSizedFullDataAccessor chunkDataAccessor = LodDataBuilder.createChunkData(chunk);
LodUtil.assertTrue(chunkDataAccessor != null);
chunkDataConsumer.accept(chunkDataAccessor);
}
catch (ClassCastException e)
{