Fix self interact + click to open menu in wardrobe

common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBalloonType.java

@@ -26,7 +26,7 @@ public class CosmeticBalloonType extends Cosmetic {
     @Override
     public void update(CosmeticUser user) {
         Player player = Bukkit.getPlayer(user.getUniqueId());
-
+        if (player == null) return;
         if (user.isInWardrobe()) return;
 
         final Location actual = player.getLocation().clone().add(Settings.getBalloonOffset());

common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java

@@ -10,6 +10,7 @@ import dev.triumphteam.gui.builder.item.ItemBuilder;
 import dev.triumphteam.gui.guis.Gui;
 import dev.triumphteam.gui.guis.GuiItem;
 import net.kyori.adventure.text.Component;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -50,6 +51,7 @@ public class Menu {
 
     public void openMenu(CosmeticUser user) {
         Player player = user.getPlayer();
+        if (player == null) return;
         final Component component = Adventure.MINI_MESSAGE.deserialize(Placeholder.applyPapiPlaceholders(player, this.title));
         Gui gui = Gui.gui().
                 title(component).
@@ -60,7 +62,12 @@ public class Menu {
 
         gui = getItems(user, gui);
 
-        gui.open(player);
+        Gui finalGui = gui;
+        Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
+            finalGui.open(player);
+        });
+
+        //gui.open(player);
 
     }
 

common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java

@@ -8,10 +8,14 @@ import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.wrappers.EnumWrappers;
 import com.comphenix.protocol.wrappers.Pair;
 import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
+import com.hibiscusmc.hmccosmetics.config.Settings;
+import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
 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.gui.Menu;
+import com.hibiscusmc.hmccosmetics.gui.Menus;
 import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
 import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
@@ -24,6 +28,7 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.inventory.InventoryClickEvent;
@@ -45,6 +50,7 @@ public class PlayerGameListener implements Listener {
         registerInventoryClickListener();
         registerMenuChangeListener();
         registerPlayerEquipmentListener();
+        registerPlayerArmListener();
     }
 
     @EventHandler
@@ -106,10 +112,12 @@ public class PlayerGameListener implements Listener {
     }
 
     @EventHandler
-    public void onPlayerHit(EntityDamageEvent event) {
+    public void onPlayerHit(EntityDamageByEntityEvent event) {
         if (event.isCancelled()) return;
         Entity entity = event.getEntity();
-        if (!entity.getPersistentDataContainer().has(new NamespacedKey(HMCCosmeticsPlugin.getInstance(), "cosmeticMob"), PersistentDataType.SHORT)) return;
+        if (event.getEntity().getEntityId() == event.getDamager().getEntityId()) event.setCancelled(true);
+        if (!entity.getPersistentDataContainer().has(new NamespacedKey(HMCCosmeticsPlugin.getInstance(), "cosmeticMob"), PersistentDataType.SHORT))
+            return;
         event.setCancelled(true);
     }
 
@@ -252,6 +260,21 @@ public class PlayerGameListener implements Listener {
         });
     }
 
+    private void registerPlayerArmListener() {
+        ProtocolLibrary.getProtocolManager().addPacketListener(new PacketAdapter(HMCCosmeticsPlugin.getInstance(), ListenerPriority.NORMAL, PacketType.Play.Client.ARM_ANIMATION) {
+            @Override
+            public void onPacketReceiving(PacketEvent event) {
+                if (!(event.getPlayer() instanceof Player)) return;
+                Player player = event.getPlayer();
+                CosmeticUser user = CosmeticUsers.getUser(player);
+                if (user == null) return;
+                Menu menu = Menus.getMenu(Settings.getDefaultMenu());
+                if (menu == null) return;
+                menu.openMenu(user);
+            }
+        });
+    }
+