Fixed merge issues.

2026-09-12 23:45:12 -04:00 · 2018-03-26 01:21:00 +01:00
parent 85925fc17b
commit 50cb6362e4
82324 changed files with 4663141 additions and 4575384 deletions
@@ -1,33 +1,33 @@
-package script.creature_spawner;
-
-import script.*;
-import script.base_class.*;
-import script.combat_engine.*;
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.Vector;
-import script.base_script;
-
-public class talus_medium extends script.creature_spawner.base_newbie_creature_spawner
-{
-    public talus_medium()
-    {
-    }
-    public int OnInitialize(obj_id self) throws InterruptedException
-    {
-        return SCRIPT_CONTINUE;
-    }
-    public int creatureDied(obj_id self, dictionary params) throws InterruptedException
-    {
-        return SCRIPT_CONTINUE;
-    }
-    public String pickCreature() throws InterruptedException
-    {
-        return null;
-    }
-    public int getMaxPop() throws InterruptedException
-    {
-        int maxPop = 0;
-        return maxPop;
-    }
-}
+package script.creature_spawner;
+
+import script.*;
+import script.base_class.*;
+import script.combat_engine.*;
+import java.util.Arrays;
+import java.util.Hashtable;
+import java.util.Vector;
+import script.base_script;
+
+public class talus_medium extends script.creature_spawner.base_newbie_creature_spawner
+{
+    public talus_medium()
+    {
+    }
+    public int OnInitialize(obj_id self) throws InterruptedException
+    {
+        return SCRIPT_CONTINUE;
+    }
+    public int creatureDied(obj_id self, dictionary params) throws InterruptedException
+    {
+        return SCRIPT_CONTINUE;
+    }
+    public String pickCreature() throws InterruptedException
+    {
+        return null;
+    }
+    public int getMaxPop() throws InterruptedException
+    {
+        int maxPop = 0;
+        return maxPop;
+    }
+}