Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Support for latest ML math formula parser

Browse Source
This commit is contained in:
Jules 2024-05-13 22:49:17 -07:00
parent a8e5a3eaec
commit 4f832195e5
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/RegisteredSkill.java
View File

@ -1,10 +1,10 @@
package net.Indyuce.mmocore.skill; package net.Indyuce.mmocore.skill;
import bsh.EvalError;
import io.lumine.mythic.lib.MythicLib; import io.lumine.mythic.lib.MythicLib;
import io.lumine.mythic.lib.UtilityMethods; import io.lumine.mythic.lib.UtilityMethods;
import io.lumine.mythic.lib.skill.handler.SkillHandler; import io.lumine.mythic.lib.skill.handler.SkillHandler;
import io.lumine.mythic.lib.skill.trigger.TriggerType; import io.lumine.mythic.lib.skill.trigger.TriggerType;
import io.lumine.mythic.lib.util.formula.BooleanExpression;
import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.api.util.MMOCoreUtils;
import net.Indyuce.mmocore.api.util.math.formula.IntegerLinearValue; import net.Indyuce.mmocore.api.util.math.formula.IntegerLinearValue;
import net.Indyuce.mmocore.api.util.math.formula.LinearValue; import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
@ -158,11 +158,7 @@ public class RegisteredSkill {
for (String category : categories) for (String category : categories)
parsedExpression = parsedExpression.replace("<" + category + ">", "true"); parsedExpression = parsedExpression.replace("<" + category + ">", "true");
parsedExpression = parsedExpression.replaceAll("<.*?>", "false"); parsedExpression = parsedExpression.replaceAll("<.*?>", "false");
try { return BooleanExpression.eval(parsedExpression);
return (boolean) MythicLib.plugin.getFormulaParser().eval(parsedExpression);
} catch (EvalError error) {
throw new RuntimeException(error);
}
} }
@Override @Override