Fix potentially using wrong env to get procs when threaded

Keeping a reference to the "currentEnv" in Script is problematic when using threads and sharing the same Script object. In addition to procedure resolution in eval(), this could have potentially affected aliases that have threading and label permission enforcement.

src/main/java/com/laytonsmith/core/Script.java

@@ -85,7 +85,6 @@ public class Script {
 	boolean compilerError = false;
 	private final long compileTime;
 	private String label;
-	private Environment currentEnv;
 	private Set<Class<? extends Environment.EnvironmentImpl>> envs;
 	private FileOptions fileOptions;
 	private SmartComment smartComment;
@@ -102,14 +101,6 @@ public String toString() {
 		return b.toString();
 	}
 
-	private Procedure getProc(String name) {
-		return currentEnv.getEnv(GlobalEnv.class).GetProcs().get(name);
-	}
-
-	public Environment getCurrentEnv() {
-		return currentEnv;
-	}
-
 	public String getLabel() {
 		return label;
 	}
@@ -215,9 +206,8 @@ public boolean uncompilable() {
 
 	public void run(final List<Variable> vars, Environment myEnv, final MethodScriptComplete done) {
 		//Some things, such as the label are determined at compile time
-		this.currentEnv = myEnv;
-		this.currentEnv.getEnv(GlobalEnv.class).SetLabel(this.label);
-		this.currentEnv.getEnv(GlobalEnv.class).SetAliasComment(this.smartComment);
+		myEnv.getEnv(GlobalEnv.class).SetLabel(this.label);
+		myEnv.getEnv(GlobalEnv.class).SetAliasComment(this.smartComment);
 		MCCommandSender p = myEnv.getEnv(CommandHelperEnvironment.class).GetCommandSender();
 		if(!hasBeenCompiled || compilerError) {
 			Target target = Target.UNKNOWN;
@@ -231,7 +221,7 @@ public void run(final List<Variable> vars, Environment myEnv, final MethodScript
 			throw ConfigRuntimeException.CreateUncatchableException("Unable to run command, script not yet compiled,"
 					+ " or a compiler error occurred for that command. To see the compile error, run /reloadaliases", target);
 		}
-		enforceLabelPermissions();
+		enforceLabelPermissions(myEnv);
 
 		try {
 			for(ParseTree rootNode : cright) {
@@ -249,8 +239,8 @@ public void run(final List<Variable> vars, Environment myEnv, final MethodScript
 					}
 				}
 
-				currentEnv.getEnv(StaticRuntimeEnv.class).getIncludeCache().executeAutoIncludes(currentEnv, this);
-				MethodScriptCompiler.execute(rootNode, currentEnv, done, this);
+				myEnv.getEnv(StaticRuntimeEnv.class).getIncludeCache().executeAutoIncludes(myEnv, this);
+				MethodScriptCompiler.execute(rootNode, myEnv, done, this);
 			}
 		} catch (ConfigRuntimeException ex) {
 			//We don't know how to handle this really, so let's pass it up the chain.
@@ -322,7 +312,6 @@ public Mixed eval(ParseTree c, final Environment env) throws CancelCommandExcept
 		}
 
 		final Mixed m = c.getData();
-		currentEnv = env;
 		if(m instanceof Construct co) {
 			if(co.getCType() != ConstructType.FUNCTION) {
 				if(co.getCType() == ConstructType.VARIABLE) {
@@ -354,7 +343,7 @@ public Mixed eval(ParseTree c, final Environment env) throws CancelCommandExcept
 
 			if(possibleFunction.hasProcedure()) {
 				//Not really a function, so we can't put it in Function.
-				Procedure p = getProc(m.val());
+				Procedure p = globalEnv.GetProcs().get(m.val());
 				if(p == null) {
 					throw new CREInvalidProcedureException("Unknown procedure \"" + m.val() + "\"", m.getTarget());
 				}
@@ -1028,7 +1017,7 @@ public void checkAmbiguous(List<Script> scripts) throws ConfigCompileException {
 		}
 	}
 
-	public void enforceLabelPermissions() {
+	public void enforceLabelPermissions(Environment currentEnv) {
 		String label = currentEnv.getEnv(GlobalEnv.class).GetLabel();
 		if(label == null || label.equals(Static.GLOBAL_PERMISSION)) {
 			return;

src/main/java/com/laytonsmith/core/functions/Meta.java

@@ -778,7 +778,7 @@ public Mixed execs(Target t, Environment environment, Script parent, ParseTree..
 				environment.getEnv(GlobalEnv.class).SetLabel(parent.getLabel());
 			}
 			environment.getEnv(CommandHelperEnvironment.class).SetCommandSender(sender);
-			parent.enforceLabelPermissions();
+			parent.enforceLabelPermissions(environment);
 			ParseTree tree = nodes[1 + offset];
 			parent.eval(tree, environment);
 			environment.getEnv(CommandHelperEnvironment.class).SetCommandSender(originalSender);