Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-04 12:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use fuzzy blocks in default block parser

Browse Source
This commit is contained in:
Jesse Boyd
2019-05-07 16:40:37 +10:00
parent 55b02e1b1f
commit 113aeb1689
3 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/FuzzyBlockState.java
View File

@ -37,20 +37,24 @@ import java.util.Objects;
*/
public class FuzzyBlockState extends BlockState {
private final Map<PropertyKey, Object> state;
private final Map<PropertyKey, Object> props;
FuzzyBlockState(BlockType blockType) {
this(blockType, null);
public FuzzyBlockState(BlockType blockType) {
this(blockType.getDefaultState(), null);
}
private FuzzyBlockState(BlockType blockType, Map<Property<?>, Object> values) {
super(blockType, blockType.getDefaultState().getInternalId(), blockType.getDefaultState().getOrdinal());
public FuzzyBlockState(BlockState state) {
this(state, null);
}
private FuzzyBlockState(BlockState state, Map<Property<?>, Object> values) {
super(state.getBlockType(), state.getInternalId(), state.getOrdinal());
if (values == null || values.isEmpty()) {
state = Collections.emptyMap();
props = Collections.emptyMap();
} else {
state = new HashMap<>(values.size());
props = new HashMap<>(values.size());
for (Map.Entry<Property<?>, Object> entry : values.entrySet()) {
state.put(entry.getKey().getKey(), entry.getValue());
props.put(entry.getKey().getKey(), entry.getValue());
}
}
}
@ -76,8 +80,8 @@ public class FuzzyBlockState extends BlockState {
if (!getBlockType().equals(o.getBlockType())) {
return false;
}
if (!state.isEmpty()) {
for (Map.Entry<PropertyKey, Object> entry : state.entrySet()) {
if (!props.isEmpty()) {
for (Map.Entry<PropertyKey, Object> entry : props.entrySet()) {
if (!Objects.equals(o.getState(entry.getKey()), entry.getValue())) {
return false;
}
@ -86,6 +90,11 @@ public class FuzzyBlockState extends BlockState {
return true;
}
@Override
public BaseBlock toBaseBlock() {
return new BaseBlock();
}
@Override
public BlockState toImmutableState() {
return getFullState();
@ -158,7 +167,7 @@ public class FuzzyBlockState extends BlockState {
if (values.isEmpty()) {
return type.getFuzzyMatcher();
}
return new FuzzyBlockState(type, values);
return new FuzzyBlockState(type.getDefaultState(), values);
}
/**