From b077cd7fb087507dbe7ba1c79a4b47dba74cfdc0 Mon Sep 17 00:00:00 2001 From: DeltaNedas <39013340+DeltaNedas@users.noreply.github.com> Date: Thu, 26 Mar 2020 22:30:34 +0000 Subject: [PATCH] let scripts require from the same mod (#1698) it seems fine to have `require("mymod/script")` e.g. if mods require a lot of scripts and want to organise it --- core/src/mindustry/mod/Scripts.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java index 1e1e5cb325..af474da6a0 100644 --- a/core/src/mindustry/mod/Scripts.java +++ b/core/src/mindustry/mod/Scripts.java @@ -122,7 +122,7 @@ public class Scripts implements Disposable{ if(matched.find()){ LoadedMod required = Vars.mods.locateMod(matched.group(1)); String script = matched.group(2); - if(required == null || root.equals(required.root.child("scripts"))){ // Mod not found, or already using a mod + if(required == null){ // Mod not found, treat it as a folder Fi dir = root.child(matched.group(1)); if(!dir.exists()) return null; // Mod and folder not found return loadSource(script, dir, validator);