Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-03 15:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

use full chunks for distr and account for __RESERVED__ blocks

Browse Source 
fixes #759
This commit is contained in:
dordsor21 2020-12-11 16:13:09 +00:00
parent 56cf49c167
commit ae39f7bba3
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/filter/DistrFilter.java
View File

@ -40,7 +40,11 @@ public class DistrFilter extends ForkedFilter<DistrFilter> {
@Override @Override
public final void applyBlock(FilterBlock block) { 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) { public int getTotal(ABlockMask mask) {

4
worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/queue/ParallelQueueExtent.java
View File

@ -178,12 +178,12 @@ public class ParallelQueueExtent extends PassthroughExtent implements IQueueWrap
@Override @Override
public List<Countable<BlockState>> getBlockDistributionWithData(Region region) { public List<Countable<BlockState>> getBlockDistributionWithData(Region region) {
return apply(region, new DistrFilter(), false).getDistribution(); return apply(region, new DistrFilter(), true).getDistribution();
} }
@Override @Override
public List<Countable<BlockType>> getBlockDistribution(Region region) { public List<Countable<BlockType>> getBlockDistribution(Region region) {
return apply(region, new DistrFilter(), false).getTypeDistribution(); return apply(region, new DistrFilter(), true).getTypeDistribution();
} }
/** /**

11
worldedit-core/src/main/java/com/sk89q/worldedit/extent/Extent.java
View File

@ -421,6 +421,10 @@ public interface Extent extends InputExtent, OutputExtent {
for (final BlockVector3 pt : region) { for (final BlockVector3 pt : region) {
BlockType type = getBlock(pt).getBlockType(); BlockType type = getBlock(pt).getBlockType();
if (type == BlockTypes.__RESERVED__) {
counter[1]++;
continue;
}
counter[type.getInternalId()]++; counter[type.getInternalId()]++;
} }
List<Countable<BlockType>> distribution = new ArrayList<>(); List<Countable<BlockType>> distribution = new ArrayList<>();
@ -446,6 +450,13 @@ public interface Extent extends InputExtent, OutputExtent {
for (final BlockVector3 pt : region) { for (final BlockVector3 pt : region) {
BlockState blk = this.getBlock(pt); BlockState blk = this.getBlock(pt);
BlockType type = blk.getBlockType(); 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()]; int[] stateCounter = counter[type.getInternalId()];
if (stateCounter == null) { if (stateCounter == null) {
counter[type.getInternalId()] = stateCounter = new int[type.getMaxStateId() + 1]; counter[type.getInternalId()] = stateCounter = new int[type.getMaxStateId() + 1];

1
worldedit-core/src/main/java/com/sk89q/worldedit/extent/PassthroughExtent.java
View File

@ -22,7 +22,6 @@ import com.sk89q.worldedit.world.block.BlockType;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.UUID;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public class PassthroughExtent extends AbstractDelegateExtent { public class PassthroughExtent extends AbstractDelegateExtent {