Fix which env bind uses

Author: LadyCailin

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

@@ -568,7 +568,8 @@ private static Mixed evalLoop(EvalStack stack, Mixed lastResult, boolean hasResu
 				// First visit: resolve function or procedure
 				if(frame.getFunction() == null && !frame.hasFlowFunction()) {
 					if(cfunc.hasProcedure()) {
-						Procedure p = gEnv.GetProcs().get(data.val());
+						Procedure p = frame.getEnv().getEnv(GlobalEnv.class)
+								.GetProcs().get(data.val());
 						if(p == null) {
 							throw new CREInvalidProcedureException(
 									"Unknown procedure \"" + data.val() + "\"", data.getTarget());

src/test/java/com/laytonsmith/testing/ProcedureTest.java

@@ -4,6 +4,9 @@
 import static com.laytonsmith.testing.StaticTest.SRun;
 
 import com.laytonsmith.core.environments.GlobalEnv;
+import com.laytonsmith.core.events.BindableEvent;
+import com.laytonsmith.core.events.Driver;
+import com.laytonsmith.core.events.EventUtils;
 import com.laytonsmith.core.exceptions.CRE.CRECastException;
 import com.laytonsmith.core.exceptions.CRE.CREStackOverflowError;
 import com.laytonsmith.core.exceptions.StackTraceManager;
@@ -13,6 +16,7 @@
 import org.junit.Test;
 
 import static org.junit.Assert.fail;
+import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -161,4 +165,37 @@ public void testCustomCallDepthLimit() throws Exception {
 		}
 	}
 
+	@Test
+	public void testProcVisibleInsideClosure() throws Exception {
+		SRun("proc _test() { msg('hello') } closure() { _test() }()", fakePlayer);
+		verify(fakePlayer).sendMessage("hello");
+	}
+
+	@Test
+	public void testProcVisibleInClosureExecutedFromBind() throws Exception {
+		try {
+			SRun("@callbacks = array()"
+					+ "\nbind('cmdline_test_event', null, null, @event, @callbacks) {"
+					+ "\n  foreach(@cb in @callbacks) {"
+					+ "\n    execute(@cb)"
+					+ "\n  }"
+					+ "\n}"
+					+ "\nproc _test() { msg('hello') }"
+					+ "\n@callbacks[] = closure() {"
+					+ "\n  _test()"
+					+ "\n}", fakePlayer);
+
+			EventUtils.TriggerListener(Driver.EXTENSION, "cmdline_test_event", new BindableEvent() {
+				@Override
+				public Object _GetObject() {
+					return new Object();
+				}
+			});
+
+			verify(fakePlayer, atLeastOnce()).sendMessage("hello");
+		} finally {
+			EventUtils.UnregisterAll();
+		}
+	}
+
 }