Fixed merge issues.

2026-10-14 05:13:14 -04:00 · 2018-03-26 01:21:00 +01:00
parent 85925fc17b
commit 50cb6362e4
82324 changed files with 4663141 additions and 4575384 deletions
@@ -1,31 +1,31 @@
-package script.creature_spawner;
-
-import script.obj_id;
-
-public class naboo_medium extends script.creature_spawner.base_newbie_creature_spawner
-{
-    public static final boolean SPAWNER_DISABLED = false;
-    public int maxPop = 4;
-
-    public naboo_medium()
-    {
-    }
-    public int OnInitialize(obj_id self) throws InterruptedException
-    {
-        spawnCreatures(self);
-        return SCRIPT_CONTINUE;
-    }
-    public String pickCreature() throws InterruptedException
-    {
-        switch (rand(1, 3))
-        {
-            case 1:
-                return "fanned_rawl";
-            case 2:
-                return "nightspider";
-            case 3:
-                return "flewt";
-        }
-        return "flewt";
-    }
-}
+package script.creature_spawner;
+
+import script.obj_id;
+
+public class naboo_medium extends script.creature_spawner.base_newbie_creature_spawner
+{
+    public static final boolean SPAWNER_DISABLED = false;
+    public int maxPop = 4;
+
+    public naboo_medium()
+    {
+    }
+    public int OnInitialize(obj_id self) throws InterruptedException
+    {
+        spawnCreatures(self);
+        return SCRIPT_CONTINUE;
+    }
+    public String pickCreature() throws InterruptedException
+    {
+        switch (rand(1, 3))
+        {
+            case 1:
+                return "fanned_rawl";
+            case 2:
+                return "nightspider";
+            case 3:
+                return "flewt";
+        }
+        return "flewt";
+    }
+}