From 34bfe2e99687bfb59ee04db6dbc45090a4641500 Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Sat, 20 Jul 2019 19:05:11 -0300
Subject: [PATCH] host tweaks

---
 .../java/carpet/commands/ScriptCommand.java   |  2 +-
 .../carpet/script/CarpetScriptServer.java     | 30 ++++++++-----------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/main/java/carpet/commands/ScriptCommand.java b/src/main/java/carpet/commands/ScriptCommand.java
index b38efe75..033a6dc1 100644
--- a/src/main/java/carpet/commands/ScriptCommand.java
+++ b/src/main/java/carpet/commands/ScriptCommand.java
@@ -211,7 +211,7 @@ public class ScriptCommand
                             boolean success = CarpetServer.scriptServer.addScriptHost(cc.getSource(), StringArgumentType.getString(cc, "package"), true);
                             return success?1:0;
                         }).
-                        then(literal("global").
+                        then(literal("shared").
                                 executes((cc) ->
                                 {
                                     boolean success = CarpetServer.scriptServer.addScriptHost(cc.getSource(), StringArgumentType.getString(cc, "package"), false);
diff --git a/src/main/java/carpet/script/CarpetScriptServer.java b/src/main/java/carpet/script/CarpetScriptServer.java
index 716870a2..142bfd6f 100644
--- a/src/main/java/carpet/script/CarpetScriptServer.java
+++ b/src/main/java/carpet/script/CarpetScriptServer.java
@@ -56,6 +56,17 @@ public class CarpetScriptServer
 
     ModuleInterface getModule(String name)
     {
+        File folder = CarpetServer.minecraft_server.getLevelStorage().resolveFile(
+                CarpetServer.minecraft_server.getLevelName(), "scripts");
+        File[] listOfFiles = folder.listFiles();
+        if (listOfFiles != null)
+            for (File script : listOfFiles)
+            {
+                if (script.getName().equalsIgnoreCase(name+".sc"))
+                {
+                    return new FileModule(script);
+                }
+            }
         for (ModuleInterface moduleData : bundledModuleData)
         {
             if (moduleData.getName().equalsIgnoreCase(name))
@@ -63,19 +74,6 @@ public class CarpetScriptServer
                 return moduleData;
             }
         }
-
-        File folder = CarpetServer.minecraft_server.getLevelStorage().resolveFile(
-                CarpetServer.minecraft_server.getLevelName(), "scripts");
-        File[] listOfFiles = folder.listFiles();
-        if (listOfFiles == null)
-            return null;
-        for (File script : listOfFiles)
-        {
-            if (script.getName().equalsIgnoreCase(name+".sc"))
-            {
-                return new FileModule(script);
-            }
-        }
         return null;
     }
 
@@ -84,8 +82,7 @@ public class CarpetScriptServer
         List<String> moduleNames = new ArrayList<>();
         for (ModuleInterface mi: bundledModuleData)
         {
-            if (!modules.containsKey(mi.getName()))
-                moduleNames.add(mi.getName());
+            moduleNames.add(mi.getName());
         }
         File folder = CarpetServer.minecraft_server.getLevelStorage().resolveFile(
                 CarpetServer.minecraft_server.getLevelName(), "scripts");
@@ -97,8 +94,7 @@ public class CarpetScriptServer
             if (script.getName().endsWith(".sc"))
             {
                 String name = script.getName().replaceFirst("\\.sc","").toLowerCase(Locale.ROOT);
-                if (!modules.containsKey(name))
-                    moduleNames.add(name);
+                moduleNames.add(name);
             }
         }
         return moduleNames;