bug fixes

SWG-Source · Mar 18, 2018 · 174343d · 174343d
1 parent 9959e1c
commit 174343d
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ quest_crc_string_table.tab
 sku.0/sys.server/compiled/.idea
 sku.0/sys.shared/compiled/game/.idea
 
+
diff --git a/sku.0/sys.server/compiled/game/.idea/workspace.xml b/sku.0/sys.server/compiled/game/.idea/workspace.xml
diff --git a/sku.0/sys.server/compiled/game/object/draft_schematic/space/chassis/havoc.tpf b/sku.0/sys.server/compiled/game/object/draft_schematic/space/chassis/havoc.tpf
@@ -11,7 +11,7 @@
 
 itemsPerContainer = 0
 category = CT_space
-craftedObjectTemplate = "object/tangible/ship/components/chassis/tieadvanced_chassis_token.iff"
+craftedObjectTemplate = "object/tangible/ship/components/chassis/havoc_chassis_token.iff"
 slots = [
 	[
 	optional = false,

diff --git a/sku.0/sys.server/compiled/game/script/systems/gcw/space/battle_controller.java b/sku.0/sys.server/compiled/game/script/systems/gcw/space/battle_controller.java
@@ -283,7 +283,7 @@ public static int getTimeUntilNextBattleForZone(String zone){
         for (String[] scene : battle_controller.BATTLE_SCENES){
             if(scene[0].equals(zone)){
                 obj_id spawner = getObjIdObjVar(controller, "space_gcw." + scene[0] + ".spawner");
-                
+
                 if(getIntObjVar(controller, "space_gcw." + spawner + ".active") == 1){
                     return -2;
                 }