diff --git a/build.xml b/build.xml index c1c35d8..98cb1eb 100644 --- a/build.xml +++ b/build.xml @@ -1,6 +1,7 @@ - Builds the scriptcraft.jar file - a plugin for bukkit + Builds the scriptcraft.jar file - a plugin for bukkit + @@ -21,8 +22,9 @@ - - Retrieving CraftBukkit artifact info + + Retrieving CraftBukkit artifact info + @@ -31,22 +33,22 @@ style="build/bukkit-to-url.xsl"/> - Retrieving CraftBukkit jar + Retrieving CraftBukkit jar + - Creating default ops.txt for your user + Creating default ops.txt for your user + - - Retrieving Coffeescript compiler - - + + - Starting Bukkit with ScriptCraft + Starting Bukkit with ScriptCraft + - - + + Retrieving Coffeescript compiler + + + + + + + + + + - [[version]] + [[version]] + diff --git a/src/main/java/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java b/src/main/java/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java index d843eb3..2df8324 100644 --- a/src/main/java/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java +++ b/src/main/java/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java @@ -99,10 +99,13 @@ public class ScriptCraftPlugin extends JavaPlugin implements Listener this.engine.put("__script",boot.getCanonicalPath().replaceAll("\\\\","/")); reader = new FileReader(boot); this.engine.eval(reader); - + /* + wph 20130811 Need to disable coffeescript support until issues loading and evaluating it are resolved. + See issue #92 // Load the CoffeeScript compiler File coffeescript = new File(JS_PLUGINS_DIR + "/core/_coffeescript.js"); this.engine.eval(new FileReader(coffeescript)); + */ }catch(Exception e){ e.printStackTrace(); @@ -153,10 +156,10 @@ public class ScriptCraftPlugin extends JavaPlugin implements Listener this.engine.put("__cmdArgs",args); result = true; } else if (cmd.getName().equalsIgnoreCase("coffee")) { - for (int i = 0;i < args.length; i++) + for (int i = 0;i < args.length; i++) javascriptCode += args[i] + " "; - javascriptCode = "eval(CoffeeScript.compile(\""+javascriptCode+"\", {bare: true}))"; - result = true; + javascriptCode = "eval(CoffeeScript.compile(\""+javascriptCode+"\", {bare: true}))"; + result = true; } if (result){