From 21f09e8c881b9d0a0117fe883fe22db6957faeb9 Mon Sep 17 00:00:00 2001
From: Ajneb97 <ajneb97@gmail.com>
Date: Sat, 18 Jan 2025 13:28:39 -0300
Subject: [PATCH] 1.15.1

---
 .../java/pk/ajneb97/managers/KitItemManager.java  | 15 ++++++++++++++-
 src/main/java/pk/ajneb97/model/item/KitItem.java  | 10 ++++++----
 src/main/resources/plugin.yml                     |  2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/main/java/pk/ajneb97/managers/KitItemManager.java b/src/main/java/pk/ajneb97/managers/KitItemManager.java
index ffe82f0..c548fca 100644
--- a/src/main/java/pk/ajneb97/managers/KitItemManager.java
+++ b/src/main/java/pk/ajneb97/managers/KitItemManager.java
@@ -159,7 +159,20 @@ public class KitItemManager {
 
     public ItemStack createItemFromKitItem(KitItem kitItem,Player player){
         if(kitItem.getOriginalItem() != null){
-            return kitItem.getOriginalItem().clone();
+            ItemStack item = kitItem.getOriginalItem().clone();
+            // Placeholders on original item
+            ItemMeta meta = item.getItemMeta();
+            if(meta.hasDisplayName()){
+                String name = OtherUtils.replaceGlobalVariables(meta.getDisplayName(),player,plugin);
+                meta.setDisplayName(name);
+            }
+            if(meta.hasLore()){
+                List<String> lore = meta.getLore();
+                lore.replaceAll(text -> OtherUtils.replaceGlobalVariables(text, player, plugin));
+                meta.setLore(lore);
+            }
+            item.setItemMeta(meta);
+            return item;
         }
 
         ItemStack item = ItemUtils.createItemFromID(kitItem.getId());
diff --git a/src/main/java/pk/ajneb97/model/item/KitItem.java b/src/main/java/pk/ajneb97/model/item/KitItem.java
index 974c4d0..281e863 100644
--- a/src/main/java/pk/ajneb97/model/item/KitItem.java
+++ b/src/main/java/pk/ajneb97/model/item/KitItem.java
@@ -262,10 +262,12 @@ public class KitItem{
         }
         lore.remove(lore.size()-1);
         lore.remove(lore.size()-1);
-        for(int i=0;i<nbt.size();i++){
-            if(nbt.get(i).startsWith("playerkits_offhand")){
-                nbt.remove(i);
-                return;
+        if(nbt != null){
+            for(int i=0;i<nbt.size();i++){
+                if(nbt.get(i).startsWith("playerkits_offhand")){
+                    nbt.remove(i);
+                    return;
+                }
             }
         }
     }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 3e5c3f9..d502ae8 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 main: pk.ajneb97.PlayerKits2
-version: 1.14.3
+version: 1.15.1
 name: PlayerKits2
 api-version: 1.13
 softdepend: [Vault,PlaceholderAPI]