Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-12 10:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved scripting support.

Browse Source
This commit is contained in:
sk89q
2011-01-22 15:38:04 -08:00
parent 9e0bb0730c
commit 213f1e19f1
4 changed files with 181 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/sk89q/worldedit/WorldEditController.java
View File

@ -2114,8 +2114,10 @@ public class WorldEditController {
* @param player
* @param filename
* @param args
* @throws WorldEditException
*/
public void runScript(LocalPlayer player, String filename, String[] args) {
public void runScript(LocalPlayer player, String filename, String[] args)
throws WorldEditException {
File dir = new File("craftscripts");
File f = new File(dir, filename);
@ -2174,7 +2176,7 @@ public class WorldEditController {
LocalSession session = getSession(player);
CraftScriptContext scriptContext =
new CraftScriptContext(this, server, config, session, player);
new CraftScriptContext(this, server, config, session, player, args);
CraftScriptEngine engine = null;
@ -2199,10 +2201,17 @@ public class WorldEditController {
try {
engine.evaluate(script, filename, vars);
} catch (ScriptException e) {
player.printError("Failed to execute:");
player.printError("Failed to execute:");;
player.printRaw(e.getMessage());
} catch (NumberFormatException e) {
throw e;
} catch (WorldEditException e) {
throw e;
} catch (Throwable e) {
player.printError("Failed to execute (exception):");
player.printRaw(e.getClass().getCanonicalName());
} finally {
for (EditSession editSession : scriptContext._getEditSessions()) {
for (EditSession editSession : scriptContext.getEditSessions()) {
session.remember(editSession);
}
}