Fix ItemConfig#merge

AuroraNetworkStudios · Jul 8, 2024 · 390e680 · 390e680
1 parent b177de9
commit 390e680
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/main/java/gg/auroramc/aurora/api/config/premade/ItemConfig.java b/src/main/java/gg/auroramc/aurora/api/config/premade/ItemConfig.java
@@ -35,7 +35,7 @@ public ItemConfig merge(ItemConfig other) {
         ret.refresh = other.refresh;
         if (other.name != null) ret.name = other.name;
 
-        if (other.lore != null) {
+        if (other.lore != null && !other.lore.isEmpty()) {
             ret.lore = new ArrayList<>(other.lore);
         }
 
@@ -50,27 +50,27 @@ public ItemConfig merge(ItemConfig other) {
             ret.skull = new SkullConfig(other.skull);
         }
 
-        if (other.flags != null) {
+        if (other.flags != null && !other.flags.isEmpty()) {
             ret.flags = new HashSet<>(other.flags);
         }
 
         if (other.potion != null) {
             ret.potion = new PotionConfig(other.potion);
         }
 
-        if (other.enchantments != null) {
+        if (other.enchantments != null && !other.enchantments.isEmpty()) {
             ret.enchantments = new HashMap<>(other.enchantments);
         }
 
-        if (other.onClick != null) {
+        if (other.onClick != null && !other.onClick.isEmpty()) {
             ret.onClick = new ArrayList<>(other.onClick);
         }
 
-        if (other.onLeftClick != null) {
+        if (other.onLeftClick != null && !other.onLeftClick.isEmpty()) {
             ret.onLeftClick = new ArrayList<>(other.onLeftClick);
         }
 
-        if (other.onRightClick != null) {
+        if (other.onRightClick != null && !other.onRightClick.isEmpty()) {
             ret.onRightClick = new ArrayList<>(other.onRightClick);
         }