diff --git a/pom.xml b/pom.xml index 7d8215f..158f581 100644 --- a/pom.xml +++ b/pom.xml @@ -16,53 +16,10 @@ - - - org.spigotmc - spigot-1.11 - 1.11.2-R0.1-SNAPSHOT - provided - - - org.spigotmc - spigot-1.12 - 1.12.2-R0.1-SNAPSHOT - provided - - - org.spigotmc - spigot-1.13 - 1.13-R0.1-SNAPSHOT - provided - org.spigotmc - spigot-1.13.1 - 1.13.1-R0.1-SNAPSHOT - provided - - - org.spigotmc - spigot-1.14 - 1.14-R0.1-SNAPSHOT + spigot + 1.14.2-R0.1-SNAPSHOT provided diff --git a/src/main/java/nl/pim16aap2/armoredElytra/handlers/CommandHandler.java b/src/main/java/nl/pim16aap2/armoredElytra/handlers/CommandHandler.java index 02d8be6..f5dcc16 100644 --- a/src/main/java/nl/pim16aap2/armoredElytra/handlers/CommandHandler.java +++ b/src/main/java/nl/pim16aap2/armoredElytra/handlers/CommandHandler.java @@ -41,7 +41,6 @@ public class CommandHandler implements CommandExecutor return true; } - if (cmd.getName().equalsIgnoreCase("ArmoredElytra")) if (args.length == 1 || args.length == 2) { @@ -111,11 +110,8 @@ public class CommandHandler implements CommandExecutor plugin.myLogger(Level.INFO, ("Giving an armored elytra of the " + ArmorTier.getArmor(armorTier) + " armor tier to player " + player.getName())); return true; } - else - { - plugin.myLogger(Level.INFO, ("Player " + args[1] + " not found!")); - return true; - } + plugin.myLogger(Level.INFO, ("Player " + args[1] + " not found!")); + return true; } } return false; diff --git a/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java b/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java index 8f7b3f8..79a913a 100644 --- a/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java +++ b/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java @@ -28,6 +28,7 @@ import nl.pim16aap2.armoredElytra.util.Action; import nl.pim16aap2.armoredElytra.util.AllowedToWearEnum; import nl.pim16aap2.armoredElytra.util.ArmorTier; import nl.pim16aap2.armoredElytra.util.Util; +import nl.pim16aap2.armoredElytra.util.XMaterial; public class EventHandlers implements Listener { @@ -46,7 +47,7 @@ public class EventHandlers implements Listener private void unenquipChestPlayer(Player p) { if (is1_9) - p.getInventory().getChestplate().setType(Material.AIR); + p.getInventory().getChestplate().setType(XMaterial.AIR.parseMaterial()); else { p.getInventory().addItem(p.getInventory().getChestplate()); @@ -60,7 +61,7 @@ public class EventHandlers implements Listener { if (is1_9) { - ItemStack air = new ItemStack(Material.AIR, 1); + ItemStack air = new ItemStack(XMaterial.AIR.parseMaterial(), 1); anvilInventory.setItem(0, air); anvilInventory.setItem(1, air); anvilInventory.setItem(2, air); @@ -112,7 +113,7 @@ public class EventHandlers implements Listener combined.put(entry.getKey(), enchantLevel); } } - else if (enchantLevel == null) + else combined.put(entry.getKey(), entry.getValue()); } @@ -150,16 +151,16 @@ public class EventHandlers implements Listener { // Get the multiplier for the repair items. double mult = 0.01; - if ( repairItem.getType() == Material.LEATHER) + if ( repairItem.getType().equals(Material.LEATHER)) mult *= (100.0f / plugin.getConfigLoader().LEATHER_TO_FULL()); - else if (repairItem.getType() == Material.GOLD_INGOT) + else if (repairItem.getType().equals(Material.GOLD_INGOT)) mult *= (100.0f / plugin.getConfigLoader().GOLD_TO_FULL()); - else if (repairItem.getType() == Material.IRON_INGOT) + else if (repairItem.getType().equals(Material.IRON_INGOT)) mult *= (100.0f / plugin.getConfigLoader().IRON_TO_FULL()); - else if (repairItem.getType() == Material.DIAMOND) + else if (repairItem.getType().equals(Material.DIAMOND)) mult *= (100.0f / plugin.getConfigLoader().DIAMONDS_TO_FULL()); int maxDurability = Material.ELYTRA.getMaxDurability(); @@ -466,7 +467,8 @@ public class EventHandlers implements Listener } } - // Because the armored elytra doesn't actually give any armor, the damage received by players wearing an armored elytra is calculated here. + // Because the armored elytra doesn't actually give any armor, the damage + // received by players wearing an armored elytra is calculated here. @EventHandler(ignoreCancelled = true) public void onPlayerDamage(EntityDamageEvent e) { diff --git a/src/main/java/nl/pim16aap2/armoredElytra/util/Util.java b/src/main/java/nl/pim16aap2/armoredElytra/util/Util.java index b5ebb5b..8a25f8d 100644 --- a/src/main/java/nl/pim16aap2/armoredElytra/util/Util.java +++ b/src/main/java/nl/pim16aap2/armoredElytra/util/Util.java @@ -32,16 +32,19 @@ public class Util } // Get the armor tier from a chest plate. - public static ArmorTier armorToTier(Material item) + public static ArmorTier armorToTier(Material mat) { ArmorTier ret = ArmorTier.NONE; + XMaterial xmat = XMaterial.matchXMaterial(mat); + if (xmat == null) + return ret; - switch (item) + switch (xmat) { case LEATHER_CHESTPLATE: ret = ArmorTier.LEATHER; break; - case GOLD_CHESTPLATE: + case GOLDEN_CHESTPLATE: ret = ArmorTier.GOLD; break; case CHAINMAIL_CHESTPLATE: @@ -62,9 +65,12 @@ public class Util // Check if mat is a chest plate. public static boolean isChestPlate(Material mat) { - if (mat == Material.LEATHER_CHESTPLATE || mat == Material.GOLD_CHESTPLATE || - mat == Material.CHAINMAIL_CHESTPLATE || mat == Material.IRON_CHESTPLATE || - mat == Material.DIAMOND_CHESTPLATE) + XMaterial xmat = XMaterial.matchXMaterial(mat); + if (xmat == null) + return false; + if (xmat == XMaterial.LEATHER_CHESTPLATE || xmat == XMaterial.GOLDEN_CHESTPLATE || + xmat == XMaterial.CHAINMAIL_CHESTPLATE || xmat == XMaterial.IRON_CHESTPLATE || + xmat == XMaterial.DIAMOND_CHESTPLATE) return true; return false; }