Cursor bugfix

RockinChaos · Feb 10, 2024 · 0dfcfc5 · 0dfcfc5
1 parent 1821c65
commit 0dfcfc5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/main/java/me/RockinChaos/itemjoin/item/ItemMap.java b/src/main/java/me/RockinChaos/itemjoin/item/ItemMap.java
@@ -4659,6 +4659,9 @@ public void removeFrom(final Player player, int... amount) {
             if (this.isSimilar(player, inv.getBoots())) {
                 inv.setBoots(new ItemStack(Material.AIR));
             }
+            if (this.isSimilar(player, player.getItemOnCursor())) {
+                player.setItemOnCursor(new ItemStack(Material.AIR));
+            }
             if (ServerUtils.hasSpecificUpdate("1_9") && this.isSimilar(player, PlayerHandler.getOffHandItem(player))) {
                 PlayerHandler.setOffHandItem(player, new ItemStack(Material.AIR));
             }
@@ -4685,6 +4688,8 @@ public void removeFrom(final Player player, int... amount) {
                 inv.setLeggings(ItemHandler.modifyItem(inv.getLeggings(), false, amount[0]));
             } else if (this.isSimilar(player, inv.getBoots())) {
                 inv.setBoots(ItemHandler.modifyItem(inv.getBoots(), false, amount[0]));
+            } else if (this.isSimilar(player, player.getItemOnCursor())) {
+                player.setItemOnCursor(ItemHandler.modifyItem(player.getItemOnCursor(), false, amount[0]));
             } else if (ServerUtils.hasSpecificUpdate("1_9") && this.isSimilar(player, PlayerHandler.getOffHandItem(player))) {
                 PlayerHandler.setOffHandItem(player, ItemHandler.modifyItem(PlayerHandler.getOffHandItem(player), false, amount[0]));
             } else if (PlayerHandler.isCraftingInv(player.getOpenInventory())) {

diff --git a/src/main/java/me/RockinChaos/itemjoin/item/ItemUtilities.java b/src/main/java/me/RockinChaos/itemjoin/item/ItemUtilities.java
@@ -407,6 +407,9 @@ private void clearItems(final TriggerType type, final Player player, final Strin
             if (this.canClear(inventory.getBoots(), "Boots", i, clearType)) {
                 inventory.setBoots(new ItemStack(Material.AIR));
             }
+            if (this.canClear(player.getItemOnCursor(), "Cursor", i, clearType)) {
+                player.setItemOnCursor(new ItemStack(Material.AIR));
+            }
             if (ServerUtils.hasSpecificUpdate("1_9") && this.canClear(inventory.getItemInOffHand(), "OffHand", i, clearType)) {
                 PlayerHandler.setOffHandItem(player, new ItemStack(Material.AIR));
             }