minor cleanup

This commit is contained in:
dordsor21 2023-10-14 20:27:46 +01:00
parent 186d24baed
commit 470c75d843
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
2 changed files with 7 additions and 9 deletions

View File

@ -12,8 +12,6 @@ import com.sk89q.worldedit.world.block.BlockTypesCache;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Arrays; import java.util.Arrays;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Future;
public class HeightmapProcessor implements IBatchProcessor { public class HeightmapProcessor implements IBatchProcessor {
@ -25,7 +23,7 @@ public class HeightmapProcessor implements IBatchProcessor {
static { static {
Arrays.fill(COMPLETE, true); Arrays.fill(COMPLETE, true);
Arrays.fill(AIR_LAYER, (char) 1); Arrays.fill(AIR_LAYER, (char) BlockTypesCache.ReservedIDs.AIR);
} }
private final int minY; private final int minY;

View File

@ -179,14 +179,14 @@ public abstract class AbstractChangeSet implements ChangeSet, IBatchProcessor {
for (int z = 0; z < 16; z++) { for (int z = 0; z < 16; z++) {
int zz = z + bz; int zz = z + bz;
for (int x = 0; x < 16; x++, index++) { for (int x = 0; x < 16; x++, index++) {
int xx = bx + x;
int from = blocksGet[index];
if (from == BlockTypesCache.ReservedIDs.__RESERVED__) {
from = BlockTypesCache.ReservedIDs.AIR;
}
final int combinedFrom = from;
final int combinedTo = blocksSet[index]; final int combinedTo = blocksSet[index];
if (combinedTo != BlockTypesCache.ReservedIDs.__RESERVED__) { if (combinedTo != BlockTypesCache.ReservedIDs.__RESERVED__) {
int xx = bx + x;
int from = blocksGet[index];
if (from == BlockTypesCache.ReservedIDs.__RESERVED__) {
from = BlockTypesCache.ReservedIDs.AIR;
}
final int combinedFrom = from;
add(xx, yy, zz, combinedFrom, combinedTo); add(xx, yy, zz, combinedFrom, combinedTo);
} }
} }