Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mask optimize

Browse Source
This commit is contained in:
Jesse Boyd 2019-11-14 17:25:37 +00:00
parent 69e1c53076
commit 2670e66ce2
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
View File

@ -1118,7 +1118,7 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
new RegionMask(new EllipsoidRegion(null, origin, Vector3.at(radius, radius, radius))), new RegionMask(new EllipsoidRegion(null, origin, Vector3.at(radius, radius, radius))),
new BoundedHeightMask( new BoundedHeightMask(
Math.max(origin.getBlockY() - depth + 1, getMinimumPoint().getBlockY()), Math.max(origin.getBlockY() - depth + 1, getMinimumPoint().getBlockY()),
Math.min(getMaximumPoint().getBlockY(), origin.getBlockY())), Math.min(getMaxY(), origin.getBlockY())),
Masks.negate(new ExistingBlockMask(this))); Masks.negate(new ExistingBlockMask(this)));
// Want to replace blocks // Want to replace blocks

19
worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/BlockMask.java
View File

@ -180,13 +180,23 @@ public class BlockMask extends ABlockMask {
public Mask tryCombine(Mask mask) { public Mask tryCombine(Mask mask) {
if (mask instanceof ABlockMask) { if (mask instanceof ABlockMask) {
ABlockMask other = (ABlockMask) mask; ABlockMask other = (ABlockMask) mask;
boolean modified = false;
boolean hasAny = false;
for (int i = 0; i < ordinals.length; i++) { for (int i = 0; i < ordinals.length; i++) {
if (ordinals[i]) { if (ordinals[i]) {
ordinals[i] = other.test(BlockState.getFromOrdinal(i)); boolean result = other.test(BlockState.getFromOrdinal(i));
hasAny |= result;
modified |= !result;
ordinals[i] = result;
} }
} }
if (modified) {
if (!hasAny) {
return Masks.alwaysFalse();
}
return this; return this;
} }
}
return null; return null;
} }
@ -194,13 +204,18 @@ public class BlockMask extends ABlockMask {
public Mask tryOr(Mask mask) { public Mask tryOr(Mask mask) {
if (mask instanceof ABlockMask) { if (mask instanceof ABlockMask) {
ABlockMask other = (ABlockMask) mask; ABlockMask other = (ABlockMask) mask;
boolean modified = false;
for (int i = 0; i < ordinals.length; i++) { for (int i = 0; i < ordinals.length; i++) {
if (!ordinals[i]) { if (!ordinals[i]) {
ordinals[i] = other.test(BlockState.getFromOrdinal(i)); boolean result = other.test(BlockState.getFromOrdinal(i));
modified |= result;
ordinals[i] = result;
} }
} }
if (modified) {
return this; return this;
} }
}
return null; return null;
} }

5
worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/MaskIntersection.java
View File

@ -144,10 +144,10 @@ public class MaskIntersection extends AbstractMask {
Set<Map.Entry<Mask, Mask>> failedCombines = new HashSet<>(); Set<Map.Entry<Mask, Mask>> failedCombines = new HashSet<>();
// Combine the masks // Combine the masks
boolean changed = false; boolean changed = false;
while (changed |= combineMasks(pairingFunction(), failedCombines)); while (combineMasks(pairingFunction(), failedCombines)) changed = true;
// Optimize / combine // Optimize / combine
do changed |= optimizeMasks(optimized); do changed |= optimizeMasks(optimized);
while (changed |= combineMasks(pairingFunction(), failedCombines) && --maxIteration > 0); while (combineMasks(pairingFunction(), failedCombines) && --maxIteration > 0);
if (maxIteration == 0) { if (maxIteration == 0) {
getLogger(MaskIntersection.class).debug("Failed optimize MaskIntersection"); getLogger(MaskIntersection.class).debug("Failed optimize MaskIntersection");
@ -169,6 +169,7 @@ public class MaskIntersection extends AbstractMask {
outer: outer:
for (Mask mask : masks) { for (Mask mask : masks) {
for (Mask other : masks) { for (Mask other : masks) {
if (mask == other) continue;
AbstractMap.SimpleEntry<Mask, Mask> pair = new AbstractMap.SimpleEntry<>(mask, other); AbstractMap.SimpleEntry<Mask, Mask> pair = new AbstractMap.SimpleEntry<>(mask, other);
if (failedCombines.contains(pair)) continue; if (failedCombines.contains(pair)) continue;
Mask combined = pairing.apply(pair); Mask combined = pairing.apply(pair);