diff --git a/mods/npc/example/dog.lua b/data/mods/npc/example/dog.lua similarity index 100% rename from mods/npc/example/dog.lua rename to data/mods/npc/example/dog.lua diff --git a/mods/npc/example/girl.lua b/data/mods/npc/example/girl.lua similarity index 100% rename from mods/npc/example/girl.lua rename to data/mods/npc/example/girl.lua diff --git a/mods/npc/example/init.lua b/data/mods/npc/example/init.lua similarity index 92% rename from mods/npc/example/init.lua rename to data/mods/npc/example/init.lua index f4253880af..c41f138197 100644 --- a/mods/npc/example/init.lua +++ b/data/mods/npc/example/init.lua @@ -17,5 +17,5 @@ do return end -- load the file with the actual instructions -dofile("mods/npc/example/girl.lua") -dofile("mods/npc/example/dog.lua") +dofile("data/mods/npc/example/girl.lua") +dofile("data/mods/npc/example/dog.lua") diff --git a/src/games/stendhal/server/core/scripting/ScriptRunner.java b/src/games/stendhal/server/core/scripting/ScriptRunner.java index 7b6757249c..ce2407612f 100644 --- a/src/games/stendhal/server/core/scripting/ScriptRunner.java +++ b/src/games/stendhal/server/core/scripting/ScriptRunner.java @@ -51,7 +51,7 @@ public class ScriptRunner extends StendhalServerExtension implements private final Map scripts; private final String scriptDir = "data/script/"; - private final String modDir = "mods/"; + private final String modsDir = "data/mods/"; private static final Logger logger = Logger.getLogger(ScriptRunner.class); @@ -149,7 +149,7 @@ public class ScriptRunner extends StendhalServerExtension implements final String rootDir; if (ismod) { - rootDir = modDir; + rootDir = modsDir; } else { rootDir = scriptDir; } @@ -501,7 +501,7 @@ public class ScriptRunner extends StendhalServerExtension implements } /** - * Retrieves Lua module initialization scripts from "mods/" directory. + * Retrieves Lua module initialization scripts from "data/mods/" directory. * * Note: These modules are separate from the regular "data/script" scripts & must * be named "init.lua". @@ -512,7 +512,7 @@ public class ScriptRunner extends StendhalServerExtension implements private List getLuaMods() { final List modlist = new ArrayList(); - final URL url = getClass().getClassLoader().getResource("mods/"); + final URL url = getClass().getClassLoader().getResource(modsDir); if (url != null) { final String modroot = url.getFile();