Fix a horrible piece of code, thanks Riley <3

GallowsDove · Mar 22, 2021 · 2ba719e · 2ba719e
1 parent 955a617
commit 2ba719e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 26 deletions.
diff --git a/src/main/java/me/gallowsdove/foxymachines/implementation/consumables/SimpleConsumable.java b/src/main/java/me/gallowsdove/foxymachines/implementation/consumables/SimpleConsumable.java
@@ -8,7 +8,6 @@
 import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffect;
 
@@ -34,19 +33,10 @@ public ItemUseHandler getItemHandler() {
             public void onRightClick(PlayerRightClickEvent e) {
                 e.cancel();
                 Player p = e.getPlayer();
-                ItemStack item;
-
-                if (e.getHand() == EquipmentSlot.HAND) {
-                    item = p.getInventory().getItemInMainHand();
-                } else {
-                    item = p.getInventory().getItemInOffHand();
-                }
-
-                if (item.getAmount() == 1) {
-                    p.getInventory().setItemInMainHand(null);
-                } else {
-                    item.setAmount(item.getAmount() - 1);
-                }
+
+                ItemStack item = e.getInteractEvent().getItem();
+
+                item.setAmount(item.getAmount() - 1);
 
                 double health = p.getHealth();
                 p.addPotionEffects(Arrays.asList(effects));

diff --git a/src/main/java/me/gallowsdove/foxymachines/implementation/materials/GhostBlock.java b/src/main/java/me/gallowsdove/foxymachines/implementation/materials/GhostBlock.java
@@ -13,7 +13,6 @@
 import org.bukkit.block.Block;
 import org.bukkit.entity.FallingBlock;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.persistence.PersistentDataType;
 import org.bukkit.util.Vector;
@@ -66,18 +65,9 @@ public void onRightClick(PlayerRightClickEvent e) {
                         block.setInvulnerable(true);
                         block.getPersistentDataContainer().set(KEY, PersistentDataType.STRING, "true");
 
-                        ItemStack item;
-                        if (e.getHand() == EquipmentSlot.HAND) {
-                            item = p.getInventory().getItemInMainHand();
-                        } else {
-                            item = p.getInventory().getItemInOffHand();
-                        }
+                        ItemStack item = e.getInteractEvent().getItem();
 
-                        if (item.getAmount() == 1) {
-                            p.getInventory().setItemInMainHand(null);
-                        } else {
-                            item.setAmount(item.getAmount() - 1);
-                        }
+                        item.setAmount(item.getAmount() - 1);
                     }
                 }
             }