mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Merge pull request #3171 from StarWishsama/fix/talisman-anvil-offhand
Fixes Talisman of anvil break main hand item in special case
This commit is contained in:
commit
13b7f05fd9
@ -223,10 +223,17 @@ public class TalismanListener implements Listener {
|
||||
public void onItemBreak(PlayerItemBreakEvent e) {
|
||||
if (Talisman.trigger(e, SlimefunItems.TALISMAN_ANVIL)) {
|
||||
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?
|
||||
if (!e.getBrokenItem().equals(inv.getItemInMainHand())) {
|
||||
if (brokenItem.equals(inv.getItemInMainHand())) {
|
||||
slot = inv.getHeldItemSlot();
|
||||
} else if (brokenItem.equals(inv.getItemInOffHand())) {
|
||||
slot = 40;
|
||||
} else {
|
||||
for (int s : armorSlots) {
|
||||
if (e.getBrokenItem().equals(inv.getItem(s))) {
|
||||
slot = s;
|
||||
@ -235,6 +242,11 @@ public class TalismanListener implements Listener {
|
||||
}
|
||||
}
|
||||
|
||||
// No item found, just return.
|
||||
if (slot < 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
ItemStack item = e.getBrokenItem().clone();
|
||||
ItemMeta meta = item.getItemMeta();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user