diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java index a76552a3..32f1a02c 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java @@ -107,23 +107,27 @@ public class TypeCosmetic extends Type { } else { ConfigurationNode itemConfig = config.node("item"); if (itemConfig.virtual()) return itemMeta; - if (itemConfig.node("locked-name").virtual() && itemConfig.node("locked-name").virtual()) { + if (itemConfig.node("locked-name").virtual() && itemConfig.node("locked-lore").virtual()) { return processLoreLines(user, itemMeta); } try { - itemMeta.getLore().clear(); + List lockedLore = itemMeta.getLore(); + String lockedName = itemMeta.getDisplayName(); - List lockedLore = Utils.replaceIfNull(itemConfig.node("locked-lore").getList(String.class), - new ArrayList()). - stream().map(StringUtils::parseStringToString).collect(Collectors.toList()); + if (!itemConfig.node("locked-lore").virtual()) { + lockedLore = Utils.replaceIfNull(itemConfig.node("locked-lore").getList(String.class), + new ArrayList()). + stream().map(StringUtils::parseStringToString).collect(Collectors.toList()); + } + if (!itemConfig.node("locked-name").virtual()) { + lockedName = StringUtils.parseStringToString(Utils.replaceIfNull(itemConfig.node("locked-name").getString(), "")); + } - if (PAPIHook.isPAPIEnabled()) { - String lockedName = StringUtils.parseStringToString(Utils.replaceIfNull(itemConfig.node("locked-name").getString(), "")); - itemMeta.setDisplayName(PlaceholderAPI.setPlaceholders(user.getPlayer(), lockedName)); - if (itemMeta.hasLore()) { - for (String loreLine : lockedLore) { - processedLore.add(PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine)); - } + itemMeta.setDisplayName(PlaceholderAPI.setPlaceholders(user.getPlayer(), lockedName)); + if (itemMeta.hasLore()) { + itemMeta.getLore().clear(); + for (String loreLine : lockedLore) { + processedLore.add(PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine)); } } } catch (Exception e) {