fixed missing client side server references. fixes #311

src/main/java/carpet/script/CarpetEventServer.java

@@ -13,6 +13,7 @@ import carpet.script.value.Value;
 import carpet.utils.Messenger;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.entity.Entity;
 import net.minecraft.server.network.ServerPlayerEntity;
@@ -51,6 +52,7 @@ import java.util.stream.Collectors;
 public class CarpetEventServer
 {
     public final List<ScheduledCall> scheduledCalls = new LinkedList<>();
+    public final MinecraftServer server;
 
     public static class Callback
     {
@@ -652,8 +654,9 @@ public class CarpetEventServer
     }
 
 
-    public CarpetEventServer()
+    public CarpetEventServer(MinecraftServer server)
     {
+        this.server = server;
         for (Event e: Event.values())
             e.handler.callList.clear();
     }

src/main/java/carpet/script/CarpetScriptHost.java

@@ -323,7 +323,7 @@ public class CarpetScriptHost extends ScriptHost
         {
             try
             {
-                callUDF(BlockPos.ORIGIN, CarpetServer.minecraft_server.getCommandSource(), closing, Collections.emptyList());
+                callUDF(BlockPos.ORIGIN, scriptServer.server.getCommandSource(), closing, Collections.emptyList());
             }
             catch (InvalidCallbackException ignored)
             {
@@ -334,8 +334,8 @@ public class CarpetScriptHost extends ScriptHost
             FunctionValue userClosing = value.getFunction("__on_close");
             if (userClosing != null)
             {
-                ServerPlayerEntity player = CarpetServer.minecraft_server.getPlayerManager().getPlayer(key);
-                ServerCommandSource source = (player != null)?player.getCommandSource():CarpetServer.minecraft_server.getCommandSource();
+                ServerPlayerEntity player = scriptServer.server.getPlayerManager().getPlayer(key);
+                ServerCommandSource source = (player != null)?player.getCommandSource():scriptServer.server.getCommandSource();
                 try
                 {
                     ((CarpetScriptHost) value).callUDF(BlockPos.ORIGIN, source, userClosing, Collections.emptyList());
@@ -347,7 +347,7 @@ public class CarpetScriptHost extends ScriptHost
         });
 
         String markerName = CarpetExpression.MARKER_STRING+"_"+((getName()==null)?"":getName());
-        for (ServerWorld world : CarpetServer.minecraft_server.getWorlds())
+        for (ServerWorld world : scriptServer.server.getWorlds())
         {
             for (Entity e : world.getEntities(EntityType.ARMOR_STAND, (as) -> as.getScoreboardTags().contains(markerName)))
             {

src/main/java/carpet/script/CarpetScriptServer.java

@@ -15,6 +15,7 @@ import carpet.utils.Messenger;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.tree.CommandNode;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.util.math.BlockPos;
 
@@ -34,6 +35,7 @@ import static net.minecraft.server.command.CommandManager.literal;
 public class CarpetScriptServer
 {
     //make static for now, but will change that later:
+    public final MinecraftServer server;
     public final CarpetScriptHost globalHost;
     public final Map<String, CarpetScriptHost> modules;
     public long tickStart;
@@ -49,14 +51,15 @@ public class CarpetScriptServer
         add(new BundledModule("math", true));
     }};
 
-    public CarpetScriptServer()
+    public CarpetScriptServer(MinecraftServer server)
     {
+        this.server = server;
         ScriptHost.systemGlobals.clear();
-        events = new CarpetEventServer();
+        events = new CarpetEventServer(server);
         modules = new HashMap<>();
         tickStart = 0L;
         stopAll = false;
-        holyMoly = CarpetServer.minecraft_server.getCommandManager().getDispatcher().getRoot().getChildren().stream().map(CommandNode::getName).collect(Collectors.toSet());
+        holyMoly = server.getCommandManager().getDispatcher().getRoot().getChildren().stream().map(CommandNode::getName).collect(Collectors.toSet());
         globalHost = CarpetScriptHost.create(this, null, false, null);
     }
 
@@ -64,10 +67,10 @@ public class CarpetScriptServer
     {
         if (CarpetSettings.scriptsAutoload)
         {
-            Messenger.m(CarpetServer.minecraft_server.getCommandSource(), "Auto-loading world scarpet apps");
+            Messenger.m(server.getCommandSource(), "Auto-loading world scarpet apps");
             for (String moduleName: listAvailableModules(false))
             {
-                addScriptHost(CarpetServer.minecraft_server.getCommandSource(), moduleName, true, true);
+                addScriptHost(server.getCommandSource(), moduleName, true, true);
             }
         }
 
@@ -75,8 +78,8 @@ public class CarpetScriptServer
 
     public Module getModule(String name, boolean allowLibraries)
     {
-        File folder = CarpetServer.minecraft_server.getLevelStorage().resolveFile(
-                CarpetServer.minecraft_server.getLevelName(), "scripts");
+        File folder = server.getLevelStorage().resolveFile(
+                server.getLevelName(), "scripts");
         File[] listOfFiles = folder.listFiles();
         if (listOfFiles != null)
             for (File script : listOfFiles)
@@ -110,8 +113,8 @@ public class CarpetScriptServer
                 if (!mi.isLibrary()) moduleNames.add(mi.getName());
             }
         }
-        File folder = CarpetServer.minecraft_server.getLevelStorage().resolveFile(
-                CarpetServer.minecraft_server.getLevelName(), "scripts");
+        File folder = server.getLevelStorage().resolveFile(
+                server.getLevelName(), "scripts");
         File[] listOfFiles = folder.listFiles();
         if (listOfFiles == null)
             return moduleNames;
@@ -223,7 +226,7 @@ public class CarpetScriptServer
                                     })));
         }
         Messenger.m(source, "gi "+hostName+" app loaded with /"+hostName+" command");
-        CarpetServer.minecraft_server.getCommandManager().getDispatcher().register(command);
+        server.getCommandManager().getDispatcher().register(command);
         CarpetServer.settingsManager.notifyPlayersCommandsChanged();
     }