From 075d2b318221637fc7792780b85b19d7f9130a4b Mon Sep 17 00:00:00 2001
From: Logan <37521985+LoJoSho@users.noreply.github.com>
Date: Sun, 7 Sep 2025 13:36:31 -0500
Subject: [PATCH] fix: move mob key to be a public value and be more specific

---
 .../hmccosmetics/listener/PlayerGameListener.java         | 8 +++-----
 .../hmccosmetics/user/manager/UserBalloonManager.java     | 2 +-
 .../com/hibiscusmc/hmccosmetics/util/HMCCServerUtils.java | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

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 148a3d63..0742e19f 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java
@@ -141,8 +141,7 @@ public class PlayerGameListener implements Listener {
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onPlayerHit(EntityDamageByEntityEvent event) {
         Entity entity = event.getEntity();
-        if (!entity.getPersistentDataContainer().has(new NamespacedKey(HMCCosmeticsPlugin.getInstance(), "cosmeticMob"), PersistentDataType.SHORT))
-            return;
+        if (!entity.getPersistentDataContainer().has(HMCCServerUtils.getCosmemeticMobKey(), PersistentDataType.BOOLEAN)) return;
         event.setCancelled(true);
     }
 
@@ -363,9 +362,8 @@ public class PlayerGameListener implements Listener {
         final Player player = event.getPlayer();
         final Entity entity = event.getRightClicked();
         // Balloons are technically actual entities, so we need to cancel any interactions with them
-        if (entity.getPersistentDataContainer().has(HMCCServerUtils.getCosmemeticMobKey())) {
-            event.setCancelled(true);
-        }
+        if (!entity.getPersistentDataContainer().has(HMCCServerUtils.getCosmemeticMobKey(), PersistentDataType.BOOLEAN)) return;
+        event.setCancelled(true);
     }
 
     @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonManager.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonManager.java
index f71e4967..67ed7134 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonManager.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonManager.java
@@ -50,7 +50,7 @@ public class UserBalloonManager {
             e.setSmall(true);
             e.setMarker(true);
             e.setPersistent(false);
-            e.getPersistentDataContainer().set(HMCCServerUtils.getCosmemeticMobKey(), PersistentDataType.SHORT, Short.valueOf("1"));
+            e.getPersistentDataContainer().set(HMCCServerUtils.getCosmemeticMobKey(), PersistentDataType.BOOLEAN, true);
         });
     }
 
diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/util/HMCCServerUtils.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/util/HMCCServerUtils.java
index 2dce30f8..809592ce 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/util/HMCCServerUtils.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/util/HMCCServerUtils.java
@@ -162,6 +162,6 @@ public class HMCCServerUtils {
     }
 
     public static NamespacedKey getCosmemeticMobKey() {
-        return new NamespacedKey(HMCCosmeticsPlugin.getInstance(), "cosmeticMob");
+        return new NamespacedKey(HMCCosmeticsPlugin.getInstance(), "cosmeticmob");
     }
 }