fix: Fix visual offhand dupe

Closes #176
EndlessCodeGroup · Apr 19, 2022 · d57910e · d57910e
1 parent 43bb381
commit d57910e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@ X changes total
 
 - Fixed `/rpginv reload` command
 - Compatibility with Mimic 0.8+
+- Visual dupe when press `F` on item
 
 ### Housekeeping
 

diff --git a/src/main/java/ru/endlesscode/rpginventory/event/listener/InventoryListener.java b/src/main/java/ru/endlesscode/rpginventory/event/listener/InventoryListener.java
@@ -374,6 +374,25 @@ public void run() {
         }
     }
 
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void afterInventoryClick(@NotNull final InventoryClickEvent event) {
+        if (event.getClick() == ClickType.SWAP_OFFHAND && event.isCancelled()) {
+            syncOffhandSlot((Player) event.getWhoClicked());
+        }
+    }
+
+    // We should manually sync offhand slot after SWAP_OFFHAND event
+    // Issue: https://hub.spigotmc.org/jira/browse/SPIGOT-6145
+    private void syncOffhandSlot(Player player) {
+        final PlayerInventory inventory = player.getInventory();
+        new TrackedBukkitRunnable() {
+            @Override
+            public void run() {
+                inventory.setItemInOffHand(inventory.getItemInOffHand());
+            }
+        }.runTaskLater(RPGInventory.getInstance(), 1);
+    }
+
     /**
      * Check
      *