From 45ffccebc60c4689e97d026f3e37b57958ddb7b6 Mon Sep 17 00:00:00 2001
From: LoJoSho <contact@lojosho.com>
Date: Thu, 12 Jan 2023 12:16:17 -0600
Subject: [PATCH] Fix for self interaction

---
 .../hibiscusmc/hmccosmetics/listener/PlayerGameListener.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 ba0d9efe..1f99ad55 100644
--- a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java
+++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java
@@ -194,6 +194,7 @@ public class PlayerGameListener implements Listener {
         //NMSHandlers.getHandler().slotUpdate(event.getPlayer(), event.getPreviousSlot());
         Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
             user.updateCosmetic(CosmeticSlot.MAINHAND);
+            user.updateCosmetic(CosmeticSlot.OFFHAND);
         }, 2);
     }
 
@@ -249,7 +250,7 @@ public class PlayerGameListener implements Listener {
                 PacketContainer packet = new PacketContainer(PacketType.Play.Server.WINDOW_ITEMS);
                 packet.getIntegers().write(0, 0);
                 for (int slot = 0; slot < 46; slot++) {
-                    if (slot >= 5 && slot <= 8 || slot == 45) {
+                    if ((slot >= 5 && slot <= 8) || slot == 45) {
                         if (!items.containsKey(slot)) continue;
                         slotData.set(slot, items.get(slot));
                         MessagesUtil.sendDebugMessages("Set " + slot + " as " + items.get(slot));
@@ -313,6 +314,7 @@ public class PlayerGameListener implements Listener {
                 Menu menu = Menus.getMenu(Settings.getDefaultMenu());
                 if (menu == null) return;
                 menu.openMenu(user);
+                event.setCancelled(true);
             }
         });
     }