arg/scriptcraft
Archived
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Only console user can load scripts - players cant load scripts because it prompts a file open dialog

Browse source
This commit is contained in:
walterhiggins 2013-01-05 16:08:08 +00:00
parent 850489b81a
commit a860387c9f
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bukkit/ScriptCraft/src/net/walterhiggins/scriptcraft/ScriptCraftEvaluator.java
View file

@ -4,6 +4,7 @@ import org.mozilla.javascript.*;
import java.util.List; import java.util.List;
import java.io.*; import java.io.*;
import javax.swing.JFileChooser; import javax.swing.JFileChooser;
import org.bukkit.entity.Player;
public class ScriptCraftEvaluator public class ScriptCraftEvaluator
{ {
@ -54,9 +55,17 @@ public class ScriptCraftEvaluator
{ {
return (ScriptableObject)this.scope; return (ScriptableObject)this.scope;
} }
//
// wph 20130105 - Only the console user should be able to load a script
// players should not be able to open scripts
//
private static Object invoker = null;
public Object eval(String javascript, Object invoker) public Object eval(String javascript, Object invoker)
{ {
ScriptCraftEvaluator.invoker = invoker;
ScriptCraftEvaluator.sc.setInvoker(invoker); ScriptCraftEvaluator.sc.setInvoker(invoker);
ScriptCraftEvaluator.sc.notifyAdministrators("js> " + javascript); ScriptCraftEvaluator.sc.notifyAdministrators("js> " + javascript);
Object result = null; Object result = null;
@ -81,6 +90,13 @@ public class ScriptCraftEvaluator
*/ */
public static Object load(Context cx, Scriptable thisObj, Object[] args, Function funObj) public static Object load(Context cx, Scriptable thisObj, Object[] args, Function funObj)
{ {
if (ScriptCraftEvaluator.invoker instanceof Player){
ScriptCraftEvaluator.sc.notifyAdministrators(invoker.toString() + " tried to load a script.\n" +
"Only the console user can load scripts.\n" +
"Players cannot load scripts.");
return null;
}
Object result = null; Object result = null;
File scriptFile = null; File scriptFile = null;