From 81e41113591dda0a0a6193385376b0230d46e603 Mon Sep 17 00:00:00 2001
From: Pim van der Loos <pimvanderloos@gmail.com>
Date: Tue, 21 May 2019 13:09:59 +0200
Subject: [PATCH] Minor update

- Fixed startup message saying noFlightDurability is disabled when it's
actually enabled and vice-versa.
- Improved order of noFlightDurability checking. It's faster now.
- Fixed default message saying that BigDoors couldn't find the message.
---
 .../nl/pim16aap2/armoredElytra/ArmoredElytra.java     |  4 ++--
 .../armoredElytra/handlers/EventHandlers.java         |  2 ++
 .../armoredElytra/handlers/FlyDurabilityHandler.java  | 11 +++++++----
 .../nl/pim16aap2/armoredElytra/util/Messages.java     |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/nl/pim16aap2/armoredElytra/ArmoredElytra.java b/src/main/java/nl/pim16aap2/armoredElytra/ArmoredElytra.java
index c8d0344..6f2adb1 100644
--- a/src/main/java/nl/pim16aap2/armoredElytra/ArmoredElytra.java
+++ b/src/main/java/nl/pim16aap2/armoredElytra/ArmoredElytra.java
@@ -110,10 +110,10 @@ public class ArmoredElytra extends JavaPlugin implements Listener
             if (config.noFlightDurability())
             {
                 Bukkit.getPluginManager().registerEvents(new FlyDurabilityHandler(nbtEditor), this);
-                myLogger(Level.INFO, "Durability penalty for flying disabled!");
+                myLogger(Level.INFO, "Durability penalty for flying enabled!");
             }
             else
-                myLogger(Level.INFO, "Durability penalty for flying enabled!");
+                myLogger(Level.INFO, "Durability penalty for flying disabled!");
 
             // Log all allowed enchantments.
             myLogger(Level.INFO, ("Allowed enchantments:"));
diff --git a/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java b/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java
index 2a37e6c..8f7b3f8 100644
--- a/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java
+++ b/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java
@@ -303,9 +303,11 @@ public class EventHandlers implements Listener
                     enchantments = combineEnchantments(enchantments, meta.getStoredEnchants());
                     break;
                 }
+                //$FALL-THROUGH$
             case BLOCK:
                 event.setResult(null);
                 player.updateInventory();
+                //$FALL-THROUGH$
             case NONE:
                 return;
             }
diff --git a/src/main/java/nl/pim16aap2/armoredElytra/handlers/FlyDurabilityHandler.java b/src/main/java/nl/pim16aap2/armoredElytra/handlers/FlyDurabilityHandler.java
index f0632b5..b875d5e 100644
--- a/src/main/java/nl/pim16aap2/armoredElytra/handlers/FlyDurabilityHandler.java
+++ b/src/main/java/nl/pim16aap2/armoredElytra/handlers/FlyDurabilityHandler.java
@@ -22,9 +22,12 @@ public class FlyDurabilityHandler implements Listener
     @EventHandler
     public void onItemDamage(PlayerItemDamageEvent e)
     {
-        if (e.getItem().getType() == Material.ELYTRA)
-            if (nbtEditor.getArmorTier(e.getItem()) != ArmorTier.NONE)
-                if (e.getPlayer().isFlying())
-                    e.setCancelled(true);
+        if (e.getItem().getType() != Material.ELYTRA)
+            return;
+        if (!e.getPlayer().isFlying())
+            return;
+
+        if (nbtEditor.getArmorTier(e.getItem()) != ArmorTier.NONE)
+            e.setCancelled(true);
     }
 }
diff --git a/src/main/java/nl/pim16aap2/armoredElytra/util/Messages.java b/src/main/java/nl/pim16aap2/armoredElytra/util/Messages.java
index 969e399..617f515 100644
--- a/src/main/java/nl/pim16aap2/armoredElytra/util/Messages.java
+++ b/src/main/java/nl/pim16aap2/armoredElytra/util/Messages.java
@@ -87,7 +87,7 @@ public class Messages
         value = messageMap.get(key);
         if (value == null)
         {
-            value = "BigDoors: Translation not found! Contact server admin!";
+            value = "ArmoredElytra: Translation not found! Contact server admin!";
             plugin.myLogger(Level.WARNING, "Failed to get translation for key " + key);
         }
         return value;