!Fix imports and extra checking

This commit is contained in:
HexedHero 2019-12-29 14:10:07 +00:00
parent 84392e150f
commit c6d6b91522

View File

@ -1,8 +1,11 @@
package net.Indyuce.mmoitems.listener;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.interaction.util.DurabilityItem;
import net.Indyuce.mmoitems.api.interaction.util.InteractItem;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Item;
@ -17,12 +20,19 @@ import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntityShootBowEvent;
import org.bukkit.event.entity.EntityToggleGlideEvent;
import org.bukkit.event.player.*;
import org.bukkit.event.player.PlayerExpChangeEvent;
import org.bukkit.event.player.PlayerFishEvent;
import org.bukkit.event.player.PlayerFishEvent.State;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerItemMendEvent;
import org.bukkit.event.player.PlayerShearEntityEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitRunnable;
import java.util.*;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.interaction.util.DurabilityItem;
import net.Indyuce.mmoitems.api.interaction.util.InteractItem;
public class CustomDurability implements Listener {
private final List<DamageCause> applyDamageCauses = Arrays.asList(DamageCause.ENTITY_ATTACK, DamageCause.ENTITY_EXPLOSION, DamageCause.BLOCK_EXPLOSION, DamageCause.THORNS, DamageCause.CONTACT, DamageCause.FIRE, DamageCause.HOT_FLOOR, DamageCause.LAVA, DamageCause.PROJECTILE);
@ -264,34 +274,33 @@ public class CustomDurability implements Listener {
DurabilityItem durabilityItem;
int durabilityGain = expAmount * 2;
ItemStack mainHandItem = player.getInventory().getItemInMainHand();
if (mainHandItem.getType() != Material.AIR)
if (mainHandItem != null && mainHandItem.getType() != Material.AIR)
if ((durabilityItem = new DurabilityItem(player, mainHandItem)).isValid() && isMending(mainHandItem))
player.getInventory().setItemInMainHand(durabilityItem.addDurability(durabilityGain).toItem());
ItemStack offHandItem = player.getInventory().getItemInOffHand();
if (offHandItem.getType() != Material.AIR)
if (offHandItem != null && offHandItem.getType() != Material.AIR)
if ((durabilityItem = new DurabilityItem(player, offHandItem)).isValid() && isMending(offHandItem))
player.getInventory().setItemInOffHand(durabilityItem.addDurability(durabilityGain).toItem());
ItemStack helmet = player.getInventory().getHelmet();
if (helmet != null)
if (helmet != null && helmet.getType() != Material.AIR)
if ((durabilityItem = new DurabilityItem(player, helmet)).isValid() && isMending(helmet))
player.getInventory().setHelmet(durabilityItem.addDurability(durabilityGain).toItem());
ItemStack chestplate = player.getInventory().getChestplate();
if (chestplate != null)
if (chestplate != null && chestplate.getType() != Material.AIR)
if ((durabilityItem = new DurabilityItem(player, chestplate)).isValid() && isMending(chestplate))
player.getInventory().setChestplate(durabilityItem.addDurability(durabilityGain).toItem());
ItemStack leggings = player.getInventory().getLeggings();
if (leggings != null)
if (leggings != null && leggings.getType() != Material.AIR)
if ((durabilityItem = new DurabilityItem(player, leggings)).isValid() && isMending(leggings))
player.getInventory().setLeggings(durabilityItem.addDurability(durabilityGain).toItem());
ItemStack boots = player.getInventory().getBoots();
if (boots != null)
if (boots != null && boots.getType() != Material.AIR)
if ((durabilityItem = new DurabilityItem(player, boots)).isValid() && isMending(boots))
player.getInventory().setBoots(durabilityItem.addDurability(durabilityGain).toItem());
}