Merge pull request JamzTheMan#12 from cwisniew/fix-2387

matejdro · Feb 12, 2021 · 37a57dd · 37a57dd
2 parents e0ca3c5 + 662e992
commit 37a57dd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/net/rptools/maptool/client/functions/ExecFunction.java b/src/main/java/net/rptools/maptool/client/functions/ExecFunction.java
@@ -20,11 +20,11 @@
 import java.util.List;
 import net.rptools.maptool.client.MapTool;
 import net.rptools.maptool.client.MapToolExpressionParser;
+import net.rptools.maptool.client.MapToolVariableResolver;
 import net.rptools.maptool.client.functions.json.JSONMacroFunctions;
 import net.rptools.maptool.client.functions.json.JsonArrayFunctions;
 import net.rptools.maptool.language.I18N;
 import net.rptools.maptool.util.FunctionUtil;
-import net.rptools.parser.MapVariableResolver;
 import net.rptools.parser.Parser;
 import net.rptools.parser.ParserException;
 import net.rptools.parser.VariableResolver;
@@ -203,7 +203,7 @@ private static void runExecFunction(String functionName, List<Object> execArgs)
     Function function = parser.getFunction(functionName);
     MapTool.getParser().enterTrustedContext(functionName, "execFunction");
     try {
-      function.evaluate(parser, new MapVariableResolver(), functionName, execArgs);
+      function.evaluate(parser, new MapToolVariableResolver(null), functionName, execArgs);
     } catch (ParserException ignored) {
     }
     MapTool.getParser().exitContext();