mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity

refactor: optimize slot check

Browse Source
This commit is contained in:
StarWishsama 2021-07-15 16:43:13 +08:00
parent 17d7521115
commit 03ab985033
No known key found for this signature in database
GPG Key ID: 51C8C46C9FF5D095
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TalismanListener.java
View File

@ -224,11 +224,14 @@ public class TalismanListener implements Listener {
if (Talisman.trigger(e, SlimefunItems.TALISMAN_ANVIL)) { if (Talisman.trigger(e, SlimefunItems.TALISMAN_ANVIL)) {
PlayerInventory inv = e.getPlayer().getInventory(); PlayerInventory inv = e.getPlayer().getInventory();
int slot = inv.getHeldItemSlot(); ItemStack brokenItem = e.getBrokenItem();
int slot = -1;
// Did the tool in our hand break or was it an armor piece? // Did the tool in our hand break or was it an armor piece?
if (!e.getBrokenItem().equals(inv.getItemInMainHand())) { if (brokenItem.equals(inv.getItemInMainHand())) {
if (e.getBrokenItem().equals(inv.getItemInOffHand())) { slot = inv.getHeldItemSlot();
} else if (brokenItem.equals(inv.getItemInOffHand())) {
slot = 40; slot = 40;
} else { } else {
for (int s : armorSlots) { for (int s : armorSlots) {
@ -238,6 +241,10 @@ public class TalismanListener implements Listener {
} }
} }
} }
// No item found, just return.
if (slot < 0) {
return;
} }
ItemStack item = e.getBrokenItem().clone(); ItemStack item = e.getBrokenItem().clone();