Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-09-06 08:02:50 +02:00
use full chunks for distr and account for __RESERVED__ blocks
fixes #759
Dieser Commit ist enthalten in:
Ursprung
56cf49c167
Commit
ae39f7bba3
@ -40,7 +40,11 @@ public class DistrFilter extends ForkedFilter<DistrFilter> {
|
||||
|
||||
@Override
|
||||
public final void applyBlock(FilterBlock block) {
|
||||
counter[block.getOrdinal()]++;
|
||||
int ordinal = block.getOrdinal();
|
||||
if (ordinal == 0) {
|
||||
ordinal = 1;
|
||||
}
|
||||
counter[ordinal]++;
|
||||
}
|
||||
|
||||
public int getTotal(ABlockMask mask) {
|
||||
|
@ -178,12 +178,12 @@ public class ParallelQueueExtent extends PassthroughExtent implements IQueueWrap
|
||||
|
||||
@Override
|
||||
public List<Countable<BlockState>> getBlockDistributionWithData(Region region) {
|
||||
return apply(region, new DistrFilter(), false).getDistribution();
|
||||
return apply(region, new DistrFilter(), true).getDistribution();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Countable<BlockType>> getBlockDistribution(Region region) {
|
||||
return apply(region, new DistrFilter(), false).getTypeDistribution();
|
||||
return apply(region, new DistrFilter(), true).getTypeDistribution();
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -421,6 +421,10 @@ public interface Extent extends InputExtent, OutputExtent {
|
||||
|
||||
for (final BlockVector3 pt : region) {
|
||||
BlockType type = getBlock(pt).getBlockType();
|
||||
if (type == BlockTypes.__RESERVED__) {
|
||||
counter[1]++;
|
||||
continue;
|
||||
}
|
||||
counter[type.getInternalId()]++;
|
||||
}
|
||||
List<Countable<BlockType>> distribution = new ArrayList<>();
|
||||
@ -446,6 +450,13 @@ public interface Extent extends InputExtent, OutputExtent {
|
||||
for (final BlockVector3 pt : region) {
|
||||
BlockState blk = this.getBlock(pt);
|
||||
BlockType type = blk.getBlockType();
|
||||
if (type == BlockTypes.__RESERVED__) {
|
||||
int[] stateCounter = counter[1];
|
||||
if (stateCounter == null) {
|
||||
counter[1] = stateCounter = new int[BlockTypes.AIR.getMaxStateId() + 1];
|
||||
}
|
||||
stateCounter[BlockTypes.AIR.getDefaultState().getInternalPropertiesId()]++;
|
||||
}
|
||||
int[] stateCounter = counter[type.getInternalId()];
|
||||
if (stateCounter == null) {
|
||||
counter[type.getInternalId()] = stateCounter = new int[type.getMaxStateId() + 1];
|
||||
|
@ -22,7 +22,6 @@ import com.sk89q.worldedit.world.block.BlockType;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class PassthroughExtent extends AbstractDelegateExtent {
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren