Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2019-10-18 22:31:49 -03:00
commit 3eb38afe3a
1 file changed
+2 -2
@@ -372,10 +372,10 @@ public class CarpetScriptServer
public boolean runas(BlockPos origin, ServerCommandSource source, String hostname, String udf_name, List<LazyValue> argv)
{
ScriptHost host = globalHost;
if (hostname != null)
host = modules.get(hostname).retrieveForExecution(source);
try
{
if (hostname != null)
host = modules.get(hostname).retrieveForExecution(source);
host.callUDF(origin, source, host.globalFunctions.get(udf_name), argv);
}
catch (NullPointerException | InvalidCallbackException npe)