From 2aed727832f7679881102de37f9e41deec313f7c Mon Sep 17 00:00:00 2001
From: LoJoSho <LoJoShogaming@gmail.com>
Date: Mon, 7 Aug 2023 10:40:03 -0500
Subject: [PATCH] fix: first person backpacks not passing color

---
 .../hmccosmetics/cosmetic/types/CosmeticBackpackType.java | 8 ++++++--
 .../com/hibiscusmc/hmccosmetics/user/CosmeticUser.java    | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java
index 81258130..6912facb 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java
@@ -8,6 +8,7 @@ import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
 import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.entity.AreaEffectCloud;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -33,7 +34,6 @@ public class CosmeticBackpackType extends Cosmetic {
         if (!config.node("firstperson-item").virtual()) {
             this.firstPersonBackpack = generateItemStack(config.node("firstperson-item"));
         }
-        //backpackType = UserBackpackManager.BackpackType.valueOf(config.node("type").getString("NORMAL").toUpperCase());
     }
 
     @Override
@@ -70,7 +70,11 @@ public class CosmeticBackpackType extends Cosmetic {
                 }
             }
             PacketManager.sendRidingPacket(particleCloud.get(particleCloud.size() - 1), user.getUserBackpackManager().getFirstArmorStandId(), owner);
-            if (!user.getHidden()) NMSHandlers.getHandler().equipmentSlotUpdate(user.getUserBackpackManager().getFirstArmorStandId(), EquipmentSlot.HEAD, firstPersonBackpack, owner);
+            if (!user.getHidden()) {
+                //if (loc.getPitch() < -70) NMSHandlers.getHandler().equipmentSlotUpdate(user.getUserBackpackManager().getFirstArmorStandId(), EquipmentSlot.HEAD, new ItemStack(Material.AIR), owner);
+                //else NMSHandlers.getHandler().equipmentSlotUpdate(user.getUserBackpackManager().getFirstArmorStandId(), EquipmentSlot.HEAD, firstPersonBackpack, owner);
+                NMSHandlers.getHandler().equipmentSlotUpdate(user.getUserBackpackManager().getFirstArmorStandId(), EquipmentSlot.HEAD, user.getUserCosmeticItem(this, firstPersonBackpack), owner);
+            }
             MessagesUtil.sendDebugMessages("First Person Backpack Update[owner=" + user.getUniqueId() + ",player_location=" + loc + "]!", Level.INFO);
         }
         PacketManager.sendRidingPacket(entity.getEntityId(), user.getUserBackpackManager().getFirstArmorStandId(), outsideViewers);
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java
index 313805e5..dd8618ff 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java
@@ -217,6 +217,10 @@ public class CosmeticUser {
             MessagesUtil.sendDebugMessages("GetUserCosemticUser Item is null");
             return null;
         }
+        return getUserCosmeticItem(cosmetic, item);
+    }
+
+    public ItemStack getUserCosmeticItem(Cosmetic cosmetic, ItemStack item) {
         if (item.hasItemMeta()) {
             ItemMeta itemMeta = item.getItemMeta();