From c57c44b90d6786f40623fe6e51213bbc0a62ae68 Mon Sep 17 00:00:00 2001
From: LoJoSho <contact@lojosho.com>
Date: Fri, 23 Dec 2022 10:05:57 -0600
Subject: [PATCH] Mainhand updates on rest of armor

---
 .../listener/PlayerConnectionListener.java           |  2 +-
 .../hmccosmetics/listener/PlayerGameListener.java    | 12 +++++++-----
 .../hibiscusmc/hmccosmetics/user/CosmeticUser.java   |  4 ++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerConnectionListener.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerConnectionListener.java
index 6b0c0a4b..3d936639 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerConnectionListener.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerConnectionListener.java
@@ -22,7 +22,7 @@ public class PlayerConnectionListener implements Listener {
             CosmeticUser user = Database.get(event.getPlayer().getUniqueId());
             CosmeticUsers.addUser(user);
             HMCCosmeticsPlugin.getInstance().getLogger().info("Run User Join");
-            Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> user.updateCosmetic(), 2);
+            Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> user.updateCosmetic(), 4);
         };
 
         if (DatabaseSettings.isEnabledDelay()) {
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java
index dcad24a7..15129e98 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java
@@ -11,6 +11,7 @@ import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
 import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
 import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
 import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
+import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticMainhandType;
 import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
@@ -211,11 +212,12 @@ public class PlayerGameListener implements Listener {
                 if (user == null) return;
 
                 for (Cosmetic cosmetic : user.getCosmetic()) {
-                    if (!(cosmetic instanceof CosmeticArmorType)) continue;
-                    Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
-                        user.updateCosmetic(cosmetic.getSlot());
-                    }, 1);
-                    HMCCosmeticsPlugin.getInstance().getLogger().info("Menu Fired, updated cosmetics " + cosmetic + " on slotdata " + windowID);
+                    if ((cosmetic instanceof CosmeticArmorType) || (cosmetic instanceof CosmeticMainhandType)) {
+                        Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
+                            user.updateCosmetic(cosmetic);
+                        }, 1);
+                        HMCCosmeticsPlugin.getInstance().getLogger().info("Menu Fired, updated cosmetics " + cosmetic + " on slotdata " + windowID);
+                    }
                 }
             }
         });
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 4c762ef8..2a752364 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java
@@ -129,6 +129,10 @@ public class CosmeticUser {
         return;
     }
 
+    public void updateCosmetic(Cosmetic cosmetic) {
+        updateCosmetic(cosmetic.getSlot());
+    }
+
     public void updateCosmetic() {
         for (Cosmetic cosmetic : playerCosmetics.values()) {
             updateCosmetic(cosmetic.getSlot());