Fixed merge issues.

2026-10-12 03:13:00 -04:00 · 2018-03-26 01:21:00 +01:00
parent 85925fc17b
commit 50cb6362e4
82324 changed files with 4663141 additions and 4575384 deletions
@@ -1,27 +1,27 @@
-package script.quest.task;
-
-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 theater_controller extends script.base_script
-{
-    public theater_controller()
-    {
-    }
-    public int OnTheaterCreated(obj_id self, obj_id[] objects, obj_id player, obj_id creator) throws InterruptedException
-    {
-        if (objects != null)
-        {
-            for (int i = 0; i < objects.length; i++)
-            {
-                setObjVar(objects[i], "quest.owner", player);
-            }
-        }
-        return SCRIPT_CONTINUE;
-    }
-}
+package script.quest.task;
+
+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 theater_controller extends script.base_script
+{
+    public theater_controller()
+    {
+    }
+    public int OnTheaterCreated(obj_id self, obj_id[] objects, obj_id player, obj_id creator) throws InterruptedException
+    {
+        if (objects != null)
+        {
+            for (int i = 0; i < objects.length; i++)
+            {
+                setObjVar(objects[i], "quest.owner", player);
+            }
+        }
+        return SCRIPT_CONTINUE;
+    }
+}