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

Upstream changes, prefix changes, formatting changes, variable name changes

Browse Source 
I think that draining waterlogged items also works now?
This commit is contained in:
MattBDev
2019-06-12 17:12:12 -04:00
parent e6a433ec93
commit 1f14d4652e
40 changed files with 587 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
worldedit-core/src/main/java/com/sk89q/worldedit/command/ScriptingCommands.java
View File

@ -87,7 +87,7 @@ public class ScriptingCommands {
String ext = filename.substring(index + 1, filename.length());
if (!ext.equalsIgnoreCase("js")) {
actor.printError(BBC.getPrefix() + "Only .js scripts are currently supported");
actor.printError("Only .js scripts are currently supported");
return null;
}
@ -100,7 +100,7 @@ public class ScriptingCommands {
file = WorldEdit.class.getResourceAsStream("craftscripts/" + filename);
if (file == null) {
actor.printError(BBC.getPrefix() + "Script does not exist: " + filename);
actor.printError("Script does not exist: " + filename);
return null;
}
} else {
@ -113,7 +113,7 @@ public class ScriptingCommands {
in.close();
script = new String(data, 0, data.length, "utf-8");
} catch (IOException e) {
actor.printError(BBC.getPrefix() + "Script read error: " + e.getMessage());
actor.printError("Script read error: " + e.getMessage());
return null;
}
@ -154,14 +154,14 @@ public class ScriptingCommands {
result = engine.evaluate(script, filename, vars);
} catch (ScriptException e) {
e.printStackTrace();
actor.printError(BBC.getPrefix() + "Failed to execute:");
actor.printError("Failed to execute:");
actor.printRaw(e.getMessage());
} catch (NumberFormatException e) {
throw e;
} catch (WorldEditException e) {
throw e;
} catch (Throwable e) {
actor.printError(BBC.getPrefix() + "Failed to execute (see console):");
actor.printError("Failed to execute (see console):");
actor.printRaw(e.getClass().getCanonicalName());
e.printStackTrace();
}
@ -203,7 +203,7 @@ public class ScriptingCommands {
@CommandPermissions("worldedit.scripting.execute")
@Logging(ALL)
public void executeLast(Player player, LocalSession session, CommandContext args) throws WorldEditException {
String lastScript = session.getLastScript();
if (!player.hasPermission("worldedit.scripting.execute." + lastScript)) {