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

Merging upstream changes

Browse Source
This commit is contained in:
matt
2019-03-26 13:27:09 -04:00
parent 85bfd16d7c
commit 0d88a6bce2
23 changed files with 1708 additions and 1768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockStateHolder.java
View File

@ -116,7 +116,8 @@ public interface BlockStateHolder<T extends BlockStateHolder<T>> extends FawePat
Map<Property<?>, Object> getStates();
/**
* @deprecated use masks - not try to this fuzzy/non fuzzy state nonsense
* Checks if the type is the same, and if the matched states are the same.
*
* @param o other block
* @return true if equal
*/
@ -148,7 +149,9 @@ public interface BlockStateHolder<T extends BlockStateHolder<T>> extends FawePat
if (getStates().isEmpty()) {
return this.getBlockType().getId();
} else {
String properties = getStates().entrySet().stream().map(entry -> entry.getKey().getName() + "=" + entry.getValue().toString().toLowerCase()).collect(Collectors.joining(","));
String properties =
getStates().entrySet().stream().map(entry -> entry.getKey().getName() + "=" + entry.getValue().toString().toLowerCase()).collect(Collectors.joining(
","));
return this.getBlockType().getId() + "[" + properties + "]";
}
}