When using run() or sudo() from main.ms, it functions properly now.

EngineHub · Aug 10, 2013 · 398fa6d · 398fa6d
1 parent 38bdaae
commit 398fa6d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCServer.java b/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCServer.java
@@ -63,7 +63,7 @@ public static MCServer Get() {
     }
 
     public boolean dispatchCommand(MCCommandSender sender, String command){
-        return s.dispatchCommand(new BukkitMCCommandSender(sender).c, command);
+        return s.dispatchCommand(((BukkitMCCommandSender)sender).c, command);
     }
 
     public MCPluginManager getPluginManager() {

diff --git a/src/main/java/com/laytonsmith/core/AliasCore.java b/src/main/java/com/laytonsmith/core/AliasCore.java
@@ -536,6 +536,7 @@ public void compileMS(MCPlayer player, Environment env) {
 			for (FileInfo fi : ms) {
 				boolean exception = false;
 				try {
+					env.getEnv(CommandHelperEnvironment.class).SetCommandSender(Static.getServer().getConsole());
 					MethodScriptCompiler.registerAutoIncludes(env, null);
 					MethodScriptCompiler.execute(MethodScriptCompiler.compile(MethodScriptCompiler.lex(fi.contents, fi.file, true)), env, null, null);
 				} catch (ConfigCompileException e) {
@@ -551,6 +552,8 @@ public void compileMS(MCPlayer player, Environment env) {
 				} catch(ProgramFlowManipulationException e){
 					exception = true;
 					ConfigRuntimeException.React(ConfigRuntimeException.CreateUncatchableException("Cannot break program flow in main files.", e.getTarget()), env);
+				} finally {
+					env.getEnv(CommandHelperEnvironment.class).SetCommandSender(null);
 				}
 				if (exception) {
 					if (Prefs.HaltOnFailure()) {