From 6032eb0782828c666d0be4cf9e0c1037f7fe0696 Mon Sep 17 00:00:00 2001
From: LoJoSho <LoJoShogaming@gmail.com>
Date: Fri, 16 Jun 2023 22:34:57 -0500
Subject: [PATCH] fix: improve handling of invalid backpacks

---
 .../hmccosmetics/cosmetic/types/CosmeticBackpackType.java | 2 +-
 .../hmccosmetics/user/manager/UserBackpackManager.java    | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

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 1b5c8b33..08c9da44 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
@@ -33,7 +33,7 @@ public class CosmeticBackpackType extends Cosmetic {
         Location loc = player.getLocation().clone().add(0, 2, 0);
 
         if (user.isInWardrobe() || !user.isBackpackSpawned()) return;
-        if (!user.getUserBackpackManager().getArmorStand().isValid()) {
+        if (!user.getUserBackpackManager().IsValidBackpackEntity()) {
             MessagesUtil.sendDebugMessages("Invalid Backpack Entity[owner=" + user.getUniqueId() + ",player_location=" + loc + "]!", Level.WARNING);
             user.respawnBackpack();
             return;
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBackpackManager.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBackpackManager.java
index 5a834eec..74143012 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBackpackManager.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBackpackManager.java
@@ -39,6 +39,14 @@ public class UserBackpackManager {
         return invisibleArmorStand;
     }
 
+    public boolean IsValidBackpackEntity() {
+        if (invisibleArmorStand == null) {
+            MessagesUtil.sendDebugMessages("InvisibleArmorStand is Null!");
+            return false;
+        }
+        return getArmorStand().isValid();
+    }
+
     public void spawnBackpack(CosmeticBackpackType cosmeticBackpackType) {
         MessagesUtil.sendDebugMessages("spawnBackpack Bukkit - Start");