EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 05:06:44 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2912 from IntellectualSites/fix/v5/blocktypewrapper

Browse Source 
Add default namespace when wrapping block categories by their ids
This commit is contained in:
Hannes Greule 2020-09-08 18:50:08 +02:00 committed by GitHub
commit c5906e780a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java
View File

@ -46,6 +46,8 @@ public class BlockTypeWrapper {
private static final Map<BlockType, BlockTypeWrapper> blockTypes = new HashMap<>(); private static final Map<BlockType, BlockTypeWrapper> blockTypes = new HashMap<>();
private static final Map<String, BlockTypeWrapper> blockCategories = new HashMap<>(); private static final Map<String, BlockTypeWrapper> blockCategories = new HashMap<>();
private static final String minecraftNamespace = "minecraft";
@Nullable @Getter private final BlockType blockType; @Nullable @Getter private final BlockType blockType;
@Nullable private final String blockCategoryId; @Nullable private final String blockCategoryId;
@Nullable private BlockCategory blockCategory; @Nullable private BlockCategory blockCategory;
@ -78,7 +80,14 @@ public class BlockTypeWrapper {
} }
public static BlockTypeWrapper get(final String blockCategoryId) { public static BlockTypeWrapper get(final String blockCategoryId) {
return blockCategories.computeIfAbsent(blockCategoryId, BlockTypeWrapper::new); // use minecraft as default namespace
String id;
if (blockCategoryId.indexOf(':') == -1) {
id = minecraftNamespace + ":" + blockCategoryId;
} else {
id = blockCategoryId;
}
return blockCategories.computeIfAbsent(id, BlockTypeWrapper::new);
} }
@Override public String toString() { @Override public String toString() {