From 12efdbd510b3122f091f840f4507177bc43b81b6 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sat, 5 Oct 2019 21:51:18 +0200 Subject: [PATCH] Minor sanity changes --- .../mrCookieSlime/Slimefun/Objects/tasks/ArmorTask.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/Objects/tasks/ArmorTask.java b/src/me/mrCookieSlime/Slimefun/Objects/tasks/ArmorTask.java index 309d760d0..9ea023e95 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/tasks/ArmorTask.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/tasks/ArmorTask.java @@ -70,8 +70,12 @@ public class ArmorTask implements Runnable { } } - if (SlimefunManager.isItemSimiliar(p.getInventory().getHelmet(), SlimefunItems.SOLAR_HELMET, true) && Slimefun.hasUnlocked(p, SlimefunItem.getByID("SOLAR_HELMET"), true) && (p.getWorld().getTime() < 12300 || p.getWorld().getTime() > 23850 && p.getEyeLocation().getBlock().getLightFromSky() == 15)) { - ItemEnergy.chargeInventory(p, Float.valueOf(String.valueOf(Slimefun.getItemValue("SOLAR_HELMET", "charge-amount")))); + if (SlimefunManager.isItemSimiliar(p.getInventory().getHelmet(), SlimefunItems.SOLAR_HELMET, true) + && Slimefun.hasUnlocked(p, SlimefunItem.getByID("SOLAR_HELMET"), true) + && (p.getWorld().getTime() < 12300 || p.getWorld().getTime() > 23850) + && p.getEyeLocation().getBlock().getLightFromSky() == 15) + { + ItemEnergy.chargeInventory(p, ((Double) Slimefun.getItemValue("SOLAR_HELMET", "charge-amount")).floatValue()); } for (ItemStack radioactive: utilities.radioactiveItems) {