diff --git a/src/main/java/com/songoda/epicenchants/listeners/EntityListener.java b/src/main/java/com/songoda/epicenchants/listeners/EntityListener.java index dc30f1e..b304764 100644 --- a/src/main/java/com/songoda/epicenchants/listeners/EntityListener.java +++ b/src/main/java/com/songoda/epicenchants/listeners/EntityListener.java @@ -17,7 +17,20 @@ import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.entity.EntityTargetLivingEntityEvent; import org.bukkit.projectiles.ProjectileSource; -import static com.songoda.epicenchants.enums.TriggerType.*; +import static com.songoda.epicenchants.enums.TriggerType.ATTACK_MOB_MELEE; +import static com.songoda.epicenchants.enums.TriggerType.ATTACK_MOB_RANGE; +import static com.songoda.epicenchants.enums.TriggerType.ATTACK_PLAYER_MELEE; +import static com.songoda.epicenchants.enums.TriggerType.ATTACK_PLAYER_RANGE; +import static com.songoda.epicenchants.enums.TriggerType.DEFENSE_MOB_MELEE; +import static com.songoda.epicenchants.enums.TriggerType.DEFENSE_MOB_RANGE; +import static com.songoda.epicenchants.enums.TriggerType.DEFENSE_PLAYER_MELEE; +import static com.songoda.epicenchants.enums.TriggerType.DEFENSE_PLAYER_RANGE; +import static com.songoda.epicenchants.enums.TriggerType.EXPLOSION_DAMAGE; +import static com.songoda.epicenchants.enums.TriggerType.FALL_DAMAGE; +import static com.songoda.epicenchants.enums.TriggerType.FIRE_DAMAGE; +import static com.songoda.epicenchants.enums.TriggerType.KILLED_MOB; +import static com.songoda.epicenchants.enums.TriggerType.LAVA_DAMAGE; +import static com.songoda.epicenchants.enums.TriggerType.POISON_DAMAGE; public class EntityListener implements Listener { private final EpicEnchants instance; 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 28bea07..83998e2 100644 --- a/src/main/java/com/songoda/epicenchants/utils/single/GeneralUtils.java +++ b/src/main/java/com/songoda/epicenchants/utils/single/GeneralUtils.java @@ -99,6 +99,8 @@ public class GeneralUtils { } public static Object parseJS(String toParse, String type, Object def) { + // FIXME: JavaScript != Math... + // Input "false ? (8 * 3) : (4 * 3)" fails for obvious reasons return MathUtils.eval(toParse, "[EpicEnchants] One of your " + type + " expressions is not properly formatted."); } }