SteamWar/FastAsyncWorldEdit
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added maximum script execution time of 3 seconds.

Browse Source
This commit is contained in:
sk89q
2010-10-03 16:12:29 -07:00
parent ddfb7f21be
commit fc2a827c07
2 changed files with 79 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/WorldEdit.java
View File

@ -631,6 +631,7 @@ public class WorldEdit extends Plugin {
* @param player
* @param filename
* @param args
* @return Whether the file was attempted execution
*/
private boolean runScript(Player player, WorldEditSession session,
EditSession editSession, String filename, String[] args) throws
@ -659,7 +660,8 @@ public class WorldEdit extends Plugin {
String code = buffer.toString();
// Evaluate
Context cx = Context.enter();
ScriptContextFactory factory = new ScriptContextFactory();
Context cx = factory.enterContext();
try {
ScriptableObject scope = cx.initStandardObjects();
@ -682,18 +684,22 @@ public class WorldEdit extends Plugin {
ScriptableObject.putProperty(scope, "minecraft",
Context.javaToJS(minecraft, scope));
logger.log(Level.INFO, player.getName() + ": executing " + filename + "...");
cx.evaluateString(scope, code, filename, 1, null);
logger.log(Level.INFO, player.getName() + ": script " + filename + " executed successfully.");
player.sendMessage(Colors.LightPurple + filename + " executed successfully.");
return true;
} catch (RhinoException re) {
player.sendMessage(Colors.Rose + "JS error: " + re.getMessage());
player.sendMessage(Colors.Rose + filename + ": JS error: " + re.getMessage());
re.printStackTrace();
} catch (Error err) {
player.sendMessage(Colors.Rose + filename + ": execution error: " + err.getMessage());
} finally {
Context.exit();
session.remember(editSession);
}
}
return true;
} catch (IOException e) {
player.sendMessage(Colors.Rose + "Script could not read or it does not exist.");
}