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

Fixed //replace and masks with states.

Browse Source
This commit is contained in:
Matthew Miller 2018-07-21 20:35:23 +10:00
parent 663dd1f4d8
commit 2239d14a01
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,13 @@ public class BlockMask extends AbstractExtentMask {
@Override @Override
public boolean test(Vector vector) { public boolean test(Vector vector) {
BlockStateHolder block = getExtent().getBlock(vector); BlockStateHolder block = getExtent().getBlock(vector);
return blocks.contains(block) || blocks.contains(block); for (BlockStateHolder testBlock : blocks) {
if (testBlock.equalsFuzzy(block)) {
return true;
}
}
return false;
} }
@Nullable @Nullable

13
worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/AbstractProperty.java
View File

@ -53,4 +53,17 @@ public abstract class AbstractProperty<T> implements Property<T> {
checkState(this.name == null, "name already set"); checkState(this.name == null, "name already set");
this.name = name; this.name = name;
} }
@Override
public int hashCode() {
return name.hashCode();
}
@Override
public boolean equals(Object obj) {
if (!(obj instanceof Property)) {
return false;
}
return getName().equals(((Property) obj).getName());
}
} }

12
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
View File

@ -31,9 +31,12 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -167,7 +170,7 @@ public class BlockState implements BlockStateHolder<BlockState> {
return false; return false;
} }
List<Property> differingProperties = new ArrayList<>(); Set<Property> differingProperties = new HashSet<>();
for (Object state : o.getStates().keySet()) { for (Object state : o.getStates().keySet()) {
if (getState((Property) state) == null) { if (getState((Property) state) == null) {
differingProperties.add((Property) state); differingProperties.add((Property) state);
@ -179,8 +182,11 @@ public class BlockState implements BlockStateHolder<BlockState> {
} }
} }
for (Property property : differingProperties) { for (Property property : getStates().keySet()) {
if (!getState(property).equals(o.getState(property))) { if (differingProperties.contains(property)) {
continue;
}
if (!Objects.equals(getState(property), o.getState(property))) {
return false; return false;
} }
} }