Fixed merge issues.

2026-10-16 07:13:29 -04:00 · 2018-03-26 01:21:00 +01:00
parent 85925fc17b
commit 50cb6362e4
82324 changed files with 4663141 additions and 4575384 deletions
@@ -1,34 +1,34 @@
-package script.space_mining;
-
-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;
-
-import script.library.space_content;
-
-public class asteroid extends script.base_script
-{
-    public asteroid()
-    {
-    }
-    public int OnAttach(obj_id self) throws InterruptedException
-    {
-        return SCRIPT_CONTINUE;
-    }
-    public int OnInitialize(obj_id self) throws InterruptedException
-    {
-        return SCRIPT_CONTINUE;
-    }
-    public int OnDestroy(obj_id self) throws InterruptedException
-    {
-        if (hasObjVar(self, "objParent"))
-        {
-            space_content.notifySpawner(self);
-        }
-        return SCRIPT_CONTINUE;
-    }
-}
+package script.space_mining;
+
+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;
+
+import script.library.space_content;
+
+public class asteroid extends script.base_script
+{
+    public asteroid()
+    {
+    }
+    public int OnAttach(obj_id self) throws InterruptedException
+    {
+        return SCRIPT_CONTINUE;
+    }
+    public int OnInitialize(obj_id self) throws InterruptedException
+    {
+        return SCRIPT_CONTINUE;
+    }
+    public int OnDestroy(obj_id self) throws InterruptedException
+    {
+        if (hasObjVar(self, "objParent"))
+        {
+            space_content.notifySpawner(self);
+        }
+        return SCRIPT_CONTINUE;
+    }
+}