From f02aa891c30cf81e8a2903e0be01856f0d6cc0dd Mon Sep 17 00:00:00 2001 From: walterhiggins Date: Sat, 5 Jan 2013 08:18:23 +0000 Subject: [PATCH] Fix for bug #11 - on windows, autoload of js scripts not working. --- .../scriptcraft/ScriptCraftPlugin.java | 13 ++++++++++++- bukkit/scriptcraft.jar | Bin 11381 -> 11548 bytes 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/bukkit/ScriptCraft/src/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java b/bukkit/ScriptCraft/src/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java index 0883d86..4c7487f 100644 --- a/bukkit/ScriptCraft/src/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java +++ b/bukkit/ScriptCraft/src/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java @@ -27,7 +27,18 @@ public class ScriptCraftPlugin extends JavaPlugin if (jsPlugins.exists()){ File[] files = jsPlugins.listFiles(); for (File f: files){ - this.evaluator.eval("load(\"" + f.getAbsolutePath() + "\")", null); + String canonicalPath = null; + try { + // + // fix for bug #11 + // + canonicalPath = f.getCanonicalPath(); + canonicalPath.replaceAll("\\\\", "/"); + this.evaluator.eval("load(\"" + canonicalPath + "\")", null); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } } } diff --git a/bukkit/scriptcraft.jar b/bukkit/scriptcraft.jar index a96ca891a330e46873293f27f20f27ae6c3da70a..db134a48a11ed68543aecb6ece2b85aa28cc2748 100644 GIT binary patch delta 4312 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 delta 4070 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