EpicKnarvik97/ArmoredElytra
EpicKnarvik97/ArmoredElytra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify clearing anvil inventory

Browse Source
This commit is contained in:
Pim van der Loos 2020-11-24 12:30:23 +01:00
parent 602acb0088
commit 9cb58d885d
No known key found for this signature in database
GPG Key ID: C16F020ADAE6D5A8
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/nl/pim16aap2/armoredElytra/handlers/AnvilHandler.java
View File

@ -205,8 +205,6 @@ public class AnvilHandler extends ArmoredElytraHandler implements Listener
return; return;
} }
int slot = e.getRawSlot();
if (anvilInventory.getItem(0) != null && anvilInventory.getItem(1) != null && if (anvilInventory.getItem(0) != null && anvilInventory.getItem(1) != null &&
anvilInventory.getItem(2) != null && anvilInventory.getItem(2).getType() == Material.ELYTRA) anvilInventory.getItem(2) != null && anvilInventory.getItem(2).getType() == Material.ELYTRA)
{ {
@ -228,9 +226,7 @@ public class AnvilHandler extends ArmoredElytraHandler implements Listener
return; return;
// Clean the anvil's inventory after transferring the items. // Clean the anvil's inventory after transferring the items.
cleanAnvilInventory(anvilInventory); anvilInventory.clear();
player.updateInventory();
return;
} }
} }
} }

11
src/main/java/nl/pim16aap2/armoredElytra/handlers/ArmoredElytraHandler.java
View File

@ -4,7 +4,6 @@ import nl.pim16aap2.armoredElytra.ArmoredElytra;
import nl.pim16aap2.armoredElytra.util.XMaterial; import nl.pim16aap2.armoredElytra.util.XMaterial;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.AnvilInventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
/** /**
@ -24,16 +23,6 @@ abstract class ArmoredElytraHandler
this.creationEnabled = creationEnabled; this.creationEnabled = creationEnabled;
} }
protected void cleanAnvilInventory(AnvilInventory anvilInventory)
{
if (anvilInventory.getItem(0) != null)
anvilInventory.getItem(0).setAmount(0);
if (anvilInventory.getItem(1) != null)
anvilInventory.getItem(1).setAmount(anvilInventory.getItem(1).getAmount() - 1);
if (anvilInventory.getItem(2) != null)
anvilInventory.getItem(2).setAmount(0);
}
// Repair an Armored Elytra // Repair an Armored Elytra
protected short repairItem(short curDur, ItemStack repairItem) protected short repairItem(short curDur, ItemStack repairItem)
{ {