Fixes around items

DecentSoftware-eu · May 18, 2024 · f1290a1 · f1290a1
1 parent 1e8541e
commit f1290a1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/src/main/java/eu/decentsoftware/holograms/api/holograms/HologramLine.java b/src/main/java/eu/decentsoftware/holograms/api/holograms/HologramLine.java
@@ -424,12 +424,12 @@ public void show(Player... players) {
                     case HEAD:
                     case SMALLHEAD:
                         nms.showFakeEntityArmorStand(player, getLocation(), entityIds[0], true, HologramLineType.HEAD != type, false);
-                        ItemStack itemStack = containsPlaceholders ? HologramItem.parseItemStack(item.getContent(), player) : item.parse();
+                        ItemStack itemStack = HologramItem.parseItemStack(item.getContent(), player);
                         nms.helmetFakeEntity(player, itemStack, entityIds[0]);
                         break;
                     case ICON:
                         nms.showFakeEntityArmorStand(player, getLocation(), entityIds[0], true, true, false);
-                        ItemStack itemStack1 = containsPlaceholders ? HologramItem.parseItemStack(item.getContent(), player) : item.parse();
+                        ItemStack itemStack1 = HologramItem.parseItemStack(item.getContent(), player);
                         nms.showFakeEntityItem(player, getLocation(), itemStack1, entityIds[1]);
                         nms.attachFakeEntity(player, entityIds[0], entityIds[1]);
                         break;

diff --git a/src/main/java/eu/decentsoftware/holograms/api/utils/items/HologramItem.java b/src/main/java/eu/decentsoftware/holograms/api/utils/items/HologramItem.java
@@ -41,6 +41,7 @@ public ItemStack parse(Player player) {
         if (material.name().contains("SKULL") || material.name().contains("HEAD")) {
             if (extras != null) {
                 String extrasFinal = player == null ? extras.trim() : PAPI.setPlaceholders(player, extras).trim();
+                extrasFinal = extrasFinal.replace("{player}", player == null ? "" : player.getName());
                 if (!extrasFinal.isEmpty()) {
                     if (extrasFinal.startsWith("HEADDATABASE_") && Bukkit.getPluginManager().isPluginEnabled("HeadDatabase")) {
                         String headDatabaseId = extrasFinal.substring("HEADDATABASE_".length());
@@ -71,16 +72,6 @@ public ItemStack parse(Player player) {
     private void parseContent() {
         String string = this.content;
 
-        // Find NBT tag
-        if (string.contains("{") && string.contains("}")) {
-            int nbtStart = string.indexOf('{');
-            int nbtEnd = string.lastIndexOf('}');
-            if (nbtStart > 0 && nbtEnd > 0 && nbtEnd > nbtStart) {
-                this.nbt = string.substring(nbtStart, nbtEnd + 1);
-                string = string.substring(0, nbtStart) + string.substring(nbtEnd + 1);
-            }
-        }
-
         // Find extras
         if (string.contains("(") && string.contains(")")) {
             int extrasStart = string.indexOf('(');
@@ -91,6 +82,16 @@ private void parseContent() {
             }
         }
 
+        // Find NBT tag
+        if (string.contains("{") && string.contains("}")) {
+            int nbtStart = string.indexOf('{');
+            int nbtEnd = string.lastIndexOf('}');
+            if (nbtStart > 0 && nbtEnd > 0 && nbtEnd > nbtStart) {
+                this.nbt = string.substring(nbtStart, nbtEnd + 1);
+                string = string.substring(0, nbtStart) + string.substring(nbtEnd + 1);
+            }
+        }
+
         if (string.contains("!ENCHANTED")) {
             string = string.replace("!ENCHANTED", "");
             this.enchanted = true;
@@ -152,7 +153,7 @@ public static HologramItem fromItemStack(ItemStack itemStack) {
 
     public static ItemStack parseItemStack(String string, Player player) {
         string = PAPI.setPlaceholders(player, string);
-        return new HologramItem(string).parse();
+        return new HologramItem(string).parse(player);
     }
 
 }