From 7ed72364504cf3a42dd46c3ba4c42e97eac4a521 Mon Sep 17 00:00:00 2001 From: Pim van der Loos Date: Thu, 20 May 2021 16:56:40 +0200 Subject: [PATCH] Add missing null check, cache Random --- .../nl/pim16aap2/armoredElytra/handlers/EventHandlers.java | 4 ++-- .../armoredElytra/handlers/SmithingTableListener.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java b/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java index 0bc3344..ae4fd51 100644 --- a/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java +++ b/src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java @@ -25,6 +25,7 @@ import java.util.Random; public class EventHandlers implements Listener { private final ArmoredElytra plugin; + private final Random random = new Random(); public EventHandlers(ArmoredElytra plugin) { @@ -96,8 +97,7 @@ public class EventHandlers implements Listener { // Get a random int between 0 and 100 to use in deciding if the durability // enchantment will take effect. - Random r = new Random(); - int randomInt = r.nextInt(101); + int randomInt = random.nextInt(101); int enchantLevel = p.getInventory().getChestplate().getEnchantmentLevel(Enchantment.DURABILITY); int durabilityDelta = (100 / (enchantLevel + 1)) < randomInt ? 0 : 1; // If the durability equals/exceeds maxDurability, it's broken (0 = full item diff --git a/src/main/java/nl/pim16aap2/armoredElytra/handlers/SmithingTableListener.java b/src/main/java/nl/pim16aap2/armoredElytra/handlers/SmithingTableListener.java index 9849efc..c205b58 100644 --- a/src/main/java/nl/pim16aap2/armoredElytra/handlers/SmithingTableListener.java +++ b/src/main/java/nl/pim16aap2/armoredElytra/handlers/SmithingTableListener.java @@ -109,7 +109,7 @@ abstract class SmithingTableListener extends ArmoredElytraHandler implements Lis return false; final ItemStack result = smithingInventory.getItem(2); - if (result.getType() != Material.ELYTRA || + if (result == null || result.getType() != Material.ELYTRA || ArmoredElytra.getInstance().getNbtEditor().getArmorTier(result) == ArmorTier.NONE) return false;