use full chunks for distr and account for __RESERVED__ blocks

fixes #759
This commit is contained in:
dordsor21
2020-12-11 16:13:09 +00:00
parent 56cf49c167
commit ae39f7bba3
4 changed files with 18 additions and 4 deletions

View File

@ -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) {

View File

@ -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();
}
/**