From a4121cb0a3f1b0f95d03d8086119432c5085bc52 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Sat, 10 Jul 2021 21:59:58 +0200 Subject: [PATCH] Fix config values not being evaluated properly [SD-8381, SD-8387] Bug introduced in 423ae8977efeae2381c352a4def341a60050ce1b --- src/main/java/com/songoda/epicenchants/EpicEnchants.java | 1 - .../com/songoda/epicenchants/objects/LeveledModifier.java | 2 +- .../com/songoda/epicenchants/utils/single/GeneralUtils.java | 6 ++---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/songoda/epicenchants/EpicEnchants.java b/src/main/java/com/songoda/epicenchants/EpicEnchants.java index 2f9e512..a2d0805 100644 --- a/src/main/java/com/songoda/epicenchants/EpicEnchants.java +++ b/src/main/java/com/songoda/epicenchants/EpicEnchants.java @@ -123,7 +123,6 @@ public class EpicEnchants extends SongodaPlugin { @Override public void onDataLoad() { - } @Override diff --git a/src/main/java/com/songoda/epicenchants/objects/LeveledModifier.java b/src/main/java/com/songoda/epicenchants/objects/LeveledModifier.java index 79f401b..6d1609e 100644 --- a/src/main/java/com/songoda/epicenchants/objects/LeveledModifier.java +++ b/src/main/java/com/songoda/epicenchants/objects/LeveledModifier.java @@ -28,6 +28,6 @@ public class LeveledModifier { String toTest = Placeholders.setPlaceholders(string, user, opponent, level); Object value = GeneralUtils.parseJS(toTest, "LeveledModifier", def); - return value instanceof Double ? (double)value : (int)value; + return value instanceof Double ? (double) value : (int) value; } } diff --git a/src/main/java/com/songoda/epicenchants/utils/single/GeneralUtils.java b/src/main/java/com/songoda/epicenchants/utils/single/GeneralUtils.java index 4a6c8c1..28bea07 100644 --- a/src/main/java/com/songoda/epicenchants/utils/single/GeneralUtils.java +++ b/src/main/java/com/songoda/epicenchants/utils/single/GeneralUtils.java @@ -85,8 +85,7 @@ public class GeneralUtils { return null; } - public static int getHeldItemSlot(Player entity, Event event) { - Player player = (Player) entity; + public static int getHeldItemSlot(Player player, Event event) { int slot = player.getInventory().getHeldItemSlot(); try { @@ -100,7 +99,6 @@ public class GeneralUtils { } public static Object parseJS(String toParse, String type, Object def) { - return MathUtils.eval("[EpicEnchants] One of your " + type + " expressions is not properly formatted.", toParse); - + return MathUtils.eval(toParse, "[EpicEnchants] One of your " + type + " expressions is not properly formatted."); } }