From 4ce4f81ce8ad044b45ea0fc9ebad4ff37121a5f6 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 17 Sep 2021 09:20:41 +0100 Subject: [PATCH] Fixed crystals and shards display lore overriding shop lore or lore from other GUIs --- .../com/willfp/ecoarmor/display/ArmorDisplay.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/display/ArmorDisplay.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/display/ArmorDisplay.java index e821d63..4d34410 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/display/ArmorDisplay.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/display/ArmorDisplay.java @@ -42,14 +42,23 @@ public class ArmorDisplay extends DisplayModule { Tier crystalTier = ArmorUtils.getCrystalTier(meta); if (crystalTier != null) { - meta.setLore(crystalTier.getCrystal().getItemMeta().getLore()); + List lore = meta.getLore(); + lore = lore == null ? new ArrayList<>() : lore; + lore.addAll(crystalTier.getCrystal().getItemMeta().getLore()); + meta.setLore(lore); itemStack.setItemMeta(meta); } ArmorSet shardSet = ArmorUtils.getShardSet(meta); if (shardSet != null) { + List beforeLore = meta.getLore(); + beforeLore = beforeLore == null ? new ArrayList<>() : beforeLore; + beforeLore.addAll(shardSet.getAdvancementShardItem().getItemMeta().getLore()); itemStack.setItemMeta(shardSet.getAdvancementShardItem().getItemMeta()); + ItemMeta meta2 = itemStack.getItemMeta(); + meta2.setLore(beforeLore); + itemStack.setItemMeta(meta2); } return;