diff --git a/core/assets/scripts/base.js b/core/assets/scripts/base.js index 3721b5b165..d078e27b89 100755 --- a/core/assets/scripts/base.js +++ b/core/assets/scripts/base.js @@ -5,7 +5,7 @@ const log = function(context, obj){ var scriptName = "base.js" var modName = "none" -const print = text => log(scriptName, text); +const print = text => log(modName + "/" + scriptName, text); const extendContent = function(classType, name, params){ return new JavaAdapter(classType, params, name) diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java index 69f272595c..7c2bde72e2 100644 --- a/core/src/mindustry/mod/Scripts.java +++ b/core/src/mindustry/mod/Scripts.java @@ -91,6 +91,9 @@ public class Scripts implements Disposable{ context.evaluateString(scope, script, file, 1, null); return true; }catch(Throwable t){ + if(currentMod != null){ + file = currentMod.name + "/" + file; + } log(LogLevel.err, file, "" + getError(t)); return false; }