Properly Remove Items

Items in all inventories seem to be nullable, meaning that setting them to null instead of creating a new itemStack would be a lot more efficient.
Crazy-Crew · Mar 23, 2024 · 29a3f1b · 29a3f1b
1 parent aba4ff2
commit 29a3f1b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.../com/badbones69/crazyenchantments/paper/api/builders/types/blacksmith/BlackSmithMenu.java b/.../com/badbones69/crazyenchantments/paper/api/builders/types/blacksmith/BlackSmithMenu.java
@@ -148,8 +148,8 @@ public void onInventoryClick(InventoryClickEvent event) {
 
                             this.methods.addItemToInventory(player, result.getResultItem());
 
-                            inventory.setItem(this.mainSlot, new ItemStack(Material.AIR));
-                            inventory.setItem(this.subSlot, new ItemStack(Material.AIR));
+                            inventory.setItem(this.mainSlot, null);
+                            inventory.setItem(this.subSlot, null);
 
                             playSound(player, this.levelUp);
 

diff --git a/...java/com/badbones69/crazyenchantments/paper/api/builders/types/tinkerer/TinkererMenu.java b/...java/com/badbones69/crazyenchantments/paper/api/builders/types/tinkerer/TinkererMenu.java
@@ -115,8 +115,8 @@ public void onInventoryClick(InventoryClickEvent event) {
                         toggle = true;
                     }
 
-                    inventory.setItem(slot.getKey(), new ItemStack(Material.AIR));
-                    inventory.setItem(slot.getValue(), new ItemStack(Material.AIR));
+                    inventory.setItem(slot.getKey(), null);
+                    inventory.setItem(slot.getValue(), null);
                 }
 
                 player.closeInventory();
@@ -139,9 +139,9 @@ public void onInventoryClick(InventoryClickEvent event) {
                 if (book == null) return;
 
                 if (event.getClickedInventory() == topInventory) { // Clicking in the tinkers.
-                    event.setCurrentItem(new ItemStack(Material.AIR));
+                    event.setCurrentItem(null);
                     bottomInventory.addItem(current);
-                    inventory.setItem(this.slots.get(event.getRawSlot()), new ItemStack(Material.AIR));
+                    inventory.setItem(this.slots.get(event.getRawSlot()), null);
                 } else { // Clicking in their inventory.
                     if (isFirstEmpty(event, player, current, topInventory)) return;
 
@@ -160,9 +160,9 @@ public void onInventoryClick(InventoryClickEvent event) {
                 // Adding an item.
                 if (event.getClickedInventory() == topInventory) { // Clicking in the tinkers.
                     if (this.slots.containsKey(event.getRawSlot())) {
-                        event.setCurrentItem(new ItemStack(Material.AIR));
+                        event.setCurrentItem(null);
                         player.getInventory().addItem(current);
-                        inventory.setItem(this.slots.get(event.getRawSlot()), new ItemStack(Material.AIR));
+                        inventory.setItem(this.slots.get(event.getRawSlot()), null);
                     }
                 } else {
                     // Clicking in their inventory.
@@ -189,7 +189,7 @@ private boolean isFirstEmpty(InventoryClickEvent event, Player player, ItemStack
                 return true;
             }
 
-            event.setCurrentItem(new ItemStack(Material.AIR));
+            event.setCurrentItem(null);
 
             return false;
         }

diff --git a/.../src/main/java/com/badbones69/crazyenchantments/paper/enchantments/SwordEnchantments.java b/.../src/main/java/com/badbones69/crazyenchantments/paper/enchantments/SwordEnchantments.java
@@ -151,7 +151,7 @@ public void onPlayerDamage(EntityDamageByEntityEvent event) {
 
                 if (inventoryItem != null) {
                     items.add(inventoryItem);
-                    inventory.setItem(i, new ItemStack(Material.AIR));
+                    inventory.setItem(i, null);
                 }
 
                 slots.add(i);