From 8455492322d6d9b3422750d4cc0c969541e3a08a Mon Sep 17 00:00:00 2001
From: HeroBrineGoat <76707404+MasterOfTheFish@users.noreply.github.com>
Date: Tue, 18 Jan 2022 20:39:41 -0500
Subject: [PATCH] Fix for backpack color not being set

---
 .../hmccosmetics/inventory/PlayerArmor.java   | 39 ++++++++++---------
 .../fisher2911/hmccosmetics/user/User.java    |  2 +-
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/main/java/io/github/fisher2911/hmccosmetics/inventory/PlayerArmor.java b/src/main/java/io/github/fisher2911/hmccosmetics/inventory/PlayerArmor.java
index 30a102a4..d36ab2fe 100644
--- a/src/main/java/io/github/fisher2911/hmccosmetics/inventory/PlayerArmor.java
+++ b/src/main/java/io/github/fisher2911/hmccosmetics/inventory/PlayerArmor.java
@@ -44,23 +44,7 @@ public class PlayerArmor {
     }
 
     public void setHat(final ArmorItem hat) {
-        if (dye == -1 || !ColorBuilder.canBeColored(hat.getItemStack())) {
-            this.hat = hat;
-            return;
-        }
-
-        final ColorBuilder colorBuilder =
-                ColorBuilder.from(hat.getItemStack()).
-                        color(Color.fromRGB(this.dye));
-        this.hat = new ArmorItem(
-                colorBuilder.build(),
-                hat.getAction(),
-                hat.getId(),
-                hat.getLockedLore(),
-                hat.getPermission(),
-                hat.getType(),
-                hat.isDyeable()
-        );
+        this.hat = this.color(hat);
     }
 
     public ArmorItem getBackpack() {
@@ -68,7 +52,26 @@ public class PlayerArmor {
     }
 
     public void setBackpack(final ArmorItem backpack) {
-        this.backpack = backpack;
+        this.backpack = this.color(backpack);
+    }
+
+    private ArmorItem color(final ArmorItem armorItem) {
+        if (this.dye == -1 || !ColorBuilder.canBeColored(armorItem.getItemStack())) {
+            return armorItem;
+        }
+
+        final ColorBuilder colorBuilder =
+                ColorBuilder.from(armorItem.getItemStack()).
+                        color(Color.fromRGB(this.dye));
+        return new ArmorItem(
+                colorBuilder.build(),
+                armorItem.getAction(),
+                armorItem.getId(),
+                armorItem.getLockedLore(),
+                armorItem.getPermission(),
+                armorItem.getType(),
+                armorItem.isDyeable()
+        );
     }
 
     public int getDye() {
diff --git a/src/main/java/io/github/fisher2911/hmccosmetics/user/User.java b/src/main/java/io/github/fisher2911/hmccosmetics/user/User.java
index 15cf4abc..4625b060 100644
--- a/src/main/java/io/github/fisher2911/hmccosmetics/user/User.java
+++ b/src/main/java/io/github/fisher2911/hmccosmetics/user/User.java
@@ -141,7 +141,7 @@ public class User {
         }
 
         if (hat.getId().equals(this.playerArmor.getHat().getId())) {
-            this.setHat(ArmorItem.empty(ArmorItem.Type.BACKPACK), plugin);
+            this.setHat(ArmorItem.empty(ArmorItem.Type.HAT), plugin);
 
             messageHandler.sendMessage(
                     player,