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

Fixes #756

Browse Source
This commit is contained in:
NotMyFault 2021-07-31 14:18:04 +02:00
parent 678fb0a8b3
commit 9f3a451ef6
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java
View File

@ -63,6 +63,9 @@ public class BlockType implements Keyed, Pattern {
private final BlockTypesCache.Settings settings; private final BlockTypesCache.Settings settings;
private final LazyReference<FuzzyBlockState> emptyFuzzy private final LazyReference<FuzzyBlockState> emptyFuzzy
= LazyReference.from(() -> new FuzzyBlockState(this)); = LazyReference.from(() -> new FuzzyBlockState(this));
@Deprecated
private final LazyReference<String> name = LazyReference.from(() -> WorldEdit.getInstance().getPlatformManager()
.queryCapability(Capability.GAME_HOOKS).getRegistries().getBlockRegistry().getName(this));
//FAWE start //FAWE start
private final LazyReference<Integer> legacyId = LazyReference.from(() -> computeLegacy(0)); private final LazyReference<Integer> legacyId = LazyReference.from(() -> computeLegacy(0));
@ -120,6 +123,7 @@ public class BlockType implements Keyed, Pattern {
String id = getId(); String id = getId();
return id.substring(id.indexOf(':') + 1); return id.substring(id.indexOf(':') + 1);
} }
//FAWE end
/** /**
* Gets the name of this block, or the ID if the name cannot be found. * Gets the name of this block, or the ID if the name cannot be found.
@ -129,7 +133,11 @@ public class BlockType implements Keyed, Pattern {
*/ */
@Deprecated @Deprecated
public String getName() { public String getName() {
return getRichName().toString(); String name = this.name.getValue();
if (name == null || name.isEmpty()) {
return getId();
}
return name;
} }
/* /*