Fixed merge issues.

2026-10-02 17:12:59 -04:00 · 2018-03-26 01:21:00 +01:00
parent 85925fc17b
commit 50cb6362e4
82324 changed files with 4663141 additions and 4575384 deletions
@@ -1,82 +1,82 @@
-package script.systems.spawning;
-
-import script.obj_id;
-
-public class spawn_master extends script.systems.spawning.spawn_base
-{
-    public spawn_master()
-    {
-    }
-    public int OnUniverseComplete(obj_id self) throws InterruptedException
-    {
-        if (!hasObjVar(self, "boolSpawnerIsOn"))
-        {
-            setObjVar(self, "boolSpawnerIsOn", true);
-        }
-        if (!hasObjVar(self, "intMaxPlanetSpawnCount"))
-        {
-            setObjVar(self, "intMaxPlanetSpawnCount", 10000);
-        }
-        else 
-        {
-            int intSpawnLimit = getIntObjVar(self, "intMaxPlanetSpawnCount");
-            if (intSpawnLimit > 10000)
-            {
-                setObjVar(self, "intMaxPlanetSpawnCount", 10000);
-            }
-        }
-        preLoadSpawnDataTables(self);
-        setObjVar(self, "intCurrentPlanetSpawnCount", 0);
-        setObjVar(self, "intMinSpawnDelay", SPAWN_PLAYER_DELAY_MIN);
-        setObjVar(self, "intMaxSpawnDelay", SPAWN_PLAYER_DELAY_MAX);
-        String strConfigSetting = getConfigSetting("GameServer", "spawningInitialState");
-        if (strConfigSetting != null)
-        {
-            if (strConfigSetting.equals("on"))
-            {
-                setObjVar(self, "boolSpawnerIsOn", true);
-            }
-            else if (strConfigSetting.equals("off"))
-            {
-                setObjVar(self, "boolSpawnerIsOn", false);
-            }
-        }
-        return SCRIPT_CONTINUE;
-    }
-    public int OnAttach(obj_id self) throws InterruptedException
-    {
-        if (!hasObjVar(self, "boolSpawnerIsOn"))
-        {
-            setObjVar(self, "boolSpawnerIsOn", true);
-        }
-        if (!hasObjVar(self, "intMaxPlanetSpawnCount"))
-        {
-            setObjVar(self, "intMaxPlanetSpawnCount", 10000);
-        }
-        else 
-        {
-            int intSpawnLimit = getIntObjVar(self, "intMaxPlanetSpawnCount");
-            if (intSpawnLimit > 10000)
-            {
-                setObjVar(self, "intMaxPlanetSpawnCount", 10000);
-            }
-        }
-        preLoadSpawnDataTables(self);
-        setObjVar(self, "intCurrentPlanetSpawnCount", 0);
-        setObjVar(self, "intMinSpawnDelay", SPAWN_PLAYER_DELAY_MIN);
-        setObjVar(self, "intMaxSpawnDelay", SPAWN_PLAYER_DELAY_MAX);
-        String strConfigSetting = getConfigSetting("GameServer", "spawningInitialState");
-        if (strConfigSetting != null)
-        {
-            if (strConfigSetting.equals("on"))
-            {
-                setObjVar(self, "boolSpawnerIsOn", true);
-            }
-            else if (strConfigSetting.equals("off"))
-            {
-                setObjVar(self, "boolSpawnerIsOn", false);
-            }
-        }
-        return SCRIPT_CONTINUE;
-    }
-}
+package script.systems.spawning;
+
+import script.obj_id;
+
+public class spawn_master extends script.systems.spawning.spawn_base
+{
+    public spawn_master()
+    {
+    }
+    public int OnUniverseComplete(obj_id self) throws InterruptedException
+    {
+        if (!hasObjVar(self, "boolSpawnerIsOn"))
+        {
+            setObjVar(self, "boolSpawnerIsOn", true);
+        }
+        if (!hasObjVar(self, "intMaxPlanetSpawnCount"))
+        {
+            setObjVar(self, "intMaxPlanetSpawnCount", 10000);
+        }
+        else 
+        {
+            int intSpawnLimit = getIntObjVar(self, "intMaxPlanetSpawnCount");
+            if (intSpawnLimit > 10000)
+            {
+                setObjVar(self, "intMaxPlanetSpawnCount", 10000);
+            }
+        }
+        preLoadSpawnDataTables(self);
+        setObjVar(self, "intCurrentPlanetSpawnCount", 0);
+        setObjVar(self, "intMinSpawnDelay", SPAWN_PLAYER_DELAY_MIN);
+        setObjVar(self, "intMaxSpawnDelay", SPAWN_PLAYER_DELAY_MAX);
+        String strConfigSetting = getConfigSetting("GameServer", "spawningInitialState");
+        if (strConfigSetting != null)
+        {
+            if (strConfigSetting.equals("on"))
+            {
+                setObjVar(self, "boolSpawnerIsOn", true);
+            }
+            else if (strConfigSetting.equals("off"))
+            {
+                setObjVar(self, "boolSpawnerIsOn", false);
+            }
+        }
+        return SCRIPT_CONTINUE;
+    }
+    public int OnAttach(obj_id self) throws InterruptedException
+    {
+        if (!hasObjVar(self, "boolSpawnerIsOn"))
+        {
+            setObjVar(self, "boolSpawnerIsOn", true);
+        }
+        if (!hasObjVar(self, "intMaxPlanetSpawnCount"))
+        {
+            setObjVar(self, "intMaxPlanetSpawnCount", 10000);
+        }
+        else 
+        {
+            int intSpawnLimit = getIntObjVar(self, "intMaxPlanetSpawnCount");
+            if (intSpawnLimit > 10000)
+            {
+                setObjVar(self, "intMaxPlanetSpawnCount", 10000);
+            }
+        }
+        preLoadSpawnDataTables(self);
+        setObjVar(self, "intCurrentPlanetSpawnCount", 0);
+        setObjVar(self, "intMinSpawnDelay", SPAWN_PLAYER_DELAY_MIN);
+        setObjVar(self, "intMaxSpawnDelay", SPAWN_PLAYER_DELAY_MAX);
+        String strConfigSetting = getConfigSetting("GameServer", "spawningInitialState");
+        if (strConfigSetting != null)
+        {
+            if (strConfigSetting.equals("on"))
+            {
+                setObjVar(self, "boolSpawnerIsOn", true);
+            }
+            else if (strConfigSetting.equals("off"))
+            {
+                setObjVar(self, "boolSpawnerIsOn", false);
+            }
+        }
+        return SCRIPT_CONTINUE;
+    }
+}