From acee288927ccca1bafa4297f0a86d88a6d131297 Mon Sep 17 00:00:00 2001 From: Pim van der Loos Date: Thu, 18 Jan 2018 18:44:17 +0100 Subject: [PATCH] - Fixed anvils being unusable for non-AE stuff. - Added backup note to uninstaller config option. --- pom.xml | 2 +- .../armoredElytra/handlers/EventHandlers.java | 14 +++++++------- .../pim16aap2/armoredElytra/util/ConfigLoader.java | 3 ++- src/main/resources/plugin.yml | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index d8a1a32..9445b42 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 nl.pim16aap2 ArmoredElytra - 2.0-SNAPSHOT + 2.0.1-SNAPSHOT diff --git a/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java b/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java index 3dc018d..fb94416 100644 --- a/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java +++ b/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java @@ -221,9 +221,14 @@ public class EventHandlers implements Listener // Verify the end result first, to prevent glitches. If the end result is invalid, remove the item and update the player's inventory. if (anvilInventory.getItem(2).getType() == Material.ELYTRA && anvilInventory.getItem(0) != null && - anvilInventory.getItem(1) != null && - verifyEnchants(anvilInventory.getItem(2).getEnchantments())) + anvilInventory.getItem(1) != null) { + if (!verifyEnchants(anvilInventory.getItem(2).getEnchantments())) + { + anvilInventory.getItem(2).setAmount(0); + p.updateInventory(); + return; + } // If the elytra is armored with any tier other than leather and the other item is leather, remove the elytra. if ((nbtEditor.getArmorTier(anvilInventory.getItem(0)) != ArmorTier.LEATHER || nbtEditor.getArmorTier(anvilInventory.getItem(1)) != ArmorTier.LEATHER) && @@ -243,11 +248,6 @@ public class EventHandlers implements Listener // Clean the anvil's inventory after transferring the items. cleanAnvil(anvilInventory); } - else - { - anvilInventory.getItem(2).setAmount(0); - p.updateInventory(); - } } new BukkitRunnable() diff --git a/src/main/java/nl/pim16aap2/armoredElytra/util/ConfigLoader.java b/src/main/java/nl/pim16aap2/armoredElytra/util/ConfigLoader.java index 66c6889..92ee12a 100644 --- a/src/main/java/nl/pim16aap2/armoredElytra/util/ConfigLoader.java +++ b/src/main/java/nl/pim16aap2/armoredElytra/util/ConfigLoader.java @@ -69,7 +69,8 @@ public class ConfigLoader {"Setting this to true will disable this plugin and remove any armored elytras it can find.", "It will check player's inventories and their end chest upon login and any regular chest when it is opened.", "This means it will take a while for all armored elytras to be removed from your server, but it doesn't take up ", - "a lot of resources, so you can just leave it installed and ignore it."}; + "a lot of resources, so you can just leave it installed and ignore it.", + "Please do not forget to MAKE A BACKUP before enabling this option!"}; private ArrayList configOptionsList; private ArmoredElytra plugin; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 728ee06..6c573eb 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: ArmoredElytra main: nl.pim16aap2.armoredElytra.ArmoredElytra -version: 2.0 +version: 2.0.1 author: Pim commands: ArmoredElytra: