Fix world gen not skipping already complete stages

This commit is contained in:
James Seibel
2024-07-12 07:41:18 -05:00
parent a9e0fd5d9b
commit ee9441c521
5 changed files with 33 additions and 9 deletions
@@ -61,7 +61,12 @@ public final class StepBiomes
for (ChunkWrapper chunkWrapper : chunkWrappers)
{
ChunkAccess chunk = chunkWrapper.getChunk();
if (!chunkWrapper.getStatus().isOrAfter(STATUS))
if (chunkWrapper.getStatus().isOrAfter(STATUS))
{
// this chunk has already generated this step
continue;
}
else if (chunk instanceof ProtoChunk)
{
#if MC_VER < MC_1_21
((ProtoChunk) chunk).setStatus(STATUS);
@@ -59,8 +59,12 @@ public final class StepFeatures
for (ChunkWrapper chunkWrapper : chunkWrappers)
{
ChunkAccess chunk = chunkWrapper.getChunk();
if (!chunkWrapper.getStatus().isOrAfter(STATUS)
&& chunk instanceof ProtoChunk)
if (chunkWrapper.getStatus().isOrAfter(STATUS))
{
// this chunk has already generated this step
continue;
}
else if (chunk instanceof ProtoChunk)
{
#if MC_VER < MC_1_21
((ProtoChunk) chunk).setStatus(STATUS);
@@ -59,7 +59,12 @@ public final class StepStructureReference
for (ChunkWrapper chunkWrapper : chunkWrappers)
{
ChunkAccess chunk = chunkWrapper.getChunk();
if (!chunkWrapper.getStatus().isOrAfter(STATUS))
if (chunkWrapper.getStatus().isOrAfter(STATUS))
{
// this chunk has already generated this step
continue;
}
else if (chunk instanceof ProtoChunk)
{
#if MC_VER < MC_1_21
((ProtoChunk) chunk).setStatus(STATUS);
@@ -76,7 +76,12 @@ public final class StepStructureStart
for (ChunkWrapper chunkWrapper : chunkWrappers)
{
ChunkAccess chunk = chunkWrapper.getChunk();
if (!chunkWrapper.getStatus().isOrAfter(STATUS))
if (chunkWrapper.getStatus().isOrAfter(STATUS))
{
// this chunk has already generated this step
continue;
}
else if (chunk instanceof ProtoChunk)
{
#if MC_VER < MC_1_21
((ProtoChunk) chunk).setStatus(STATUS);
@@ -88,12 +93,12 @@ public final class StepStructureStart
}
#if MC_VER < MC_1_19_2
if (environment.params.worldGenSettings.generateFeatures())
if (this.environment.params.worldGenSettings.generateFeatures())
{
#elif MC_VER < MC_1_19_4
if (environment.params.worldGenSettings.generateStructures()) {
if (this.environment.params.worldGenSettings.generateStructures()) {
#else
if (environment.params.worldOptions.generateStructures())
if (this.environment.params.worldOptions.generateStructures())
{
#endif
for (ChunkAccess chunk : chunksToDo)
@@ -58,7 +58,12 @@ public final class StepSurface
for (ChunkWrapper chunkWrapper : chunkWrappers)
{
ChunkAccess chunk = chunkWrapper.getChunk();
if (!chunkWrapper.getStatus().isOrAfter(STATUS))
if (chunkWrapper.getStatus().isOrAfter(STATUS))
{
// this chunk has already generated this step
continue;
}
else if (chunk instanceof ProtoChunk)
{
#if MC_VER < MC_1_21
((ProtoChunk) chunk).setStatus(STATUS);