From afa925a2de5ce6cbe100e1090301a4b59da43640 Mon Sep 17 00:00:00 2001 From: Cekis Date: Thu, 12 May 2016 01:17:39 +0100 Subject: [PATCH] Fixed issue where the patrol path of Blacksun Boarders in the ISD instance was not being set properly, crashing the server. --- .../spawning/heroic/heroic_star_destroyer.tab | 6 +++--- .../dungeon_sequencer/sequence_controller.java | 12 ++---------- 2 files changed, 5 insertions(+), 13 deletions(-) mode change 100644 => 100755 sku.0/sys.server/compiled/game/datatables/spawning/heroic/heroic_star_destroyer.tab diff --git a/sku.0/sys.server/compiled/game/datatables/spawning/heroic/heroic_star_destroyer.tab b/sku.0/sys.server/compiled/game/datatables/spawning/heroic/heroic_star_destroyer.tab old mode 100644 new mode 100755 index 80df5b158..b2350b533 --- a/sku.0/sys.server/compiled/game/datatables/spawning/heroic/heroic_star_destroyer.tab +++ b/sku.0/sys.server/compiled/game/datatables/spawning/heroic/heroic_star_destroyer.tab @@ -332,11 +332,11 @@ heroic_sd_blacksun_engineer cryer2 spawn_engineering reactorctrl 27.79 140.58 43 heroic_sd_blacksun_engineer replace_cryer_2 reactorctrl 27.79 140.58 436.8711 180 deleteSpawn:cryer2:none replace_cryer_2 delayAction:eng2r1:20 eng2warn -heroic_sd_blacksun_boarder eng2r1 cooling 15.49 140.58 444.36 "int:run=1,string:patrol_path:eng2rein" "eng2rein:patrolFlip:ratpat8,ratpat7,ratpat6,ratpat5,ratpat4" +heroic_sd_blacksun_boarder eng2r1 cooling 15.49 140.58 444.36 "int:run=1,string:patrol_path=eng2rein" "eng2rein:patrolFlip:ratpat8,ratpat7,ratpat6,ratpat5,ratpat4" delayAction:eng2r2:25 eng2r1 -heroic_sd_blacksun_boarder eng2r2 cooling 15.49 140.58 444.36 "int:run=1,string:patrol_path:eng2rein" +heroic_sd_blacksun_boarder eng2r2 cooling 15.49 140.58 444.36 "int:run=1,string:patrol_path=eng2rein" delayAction:eng2r3:25 eng2r2 -heroic_sd_blacksun_boarder eng2r3 cooling 15.49 140.58 444.36 "int:run=1,string:patrol_path:eng2rein" +heroic_sd_blacksun_boarder eng2r3 cooling 15.49 140.58 444.36 "int:run=1,string:patrol_path=eng2rein" heroic_sd_blacksun_engineer spawn_engineering reactorctrl 29.5 141.08 433.31 180 heroic_sd_blacksun_engineer spawn_engineering cooling 18.89 140.58 448.57 -90 heroic_sd_blacksun_engineer cryer3 spawn_engineering reactorchamber 21.066 140.585 479.18 68 "OnEnterCombat:triggerId:eng3warn,OnEnterCombat:playEmote:say:sd_bs_engineer_reinforcement_call,OnExitCombat:triggerId:delete_cryer_3" diff --git a/sku.0/sys.server/compiled/game/script/systems/dungeon_sequencer/sequence_controller.java b/sku.0/sys.server/compiled/game/script/systems/dungeon_sequencer/sequence_controller.java index eb0cd13b0..81b00c750 100755 --- a/sku.0/sys.server/compiled/game/script/systems/dungeon_sequencer/sequence_controller.java +++ b/sku.0/sys.server/compiled/game/script/systems/dungeon_sequencer/sequence_controller.java @@ -813,16 +813,8 @@ public class sequence_controller extends script.base_script data = typeDataSplit[1]; nameValueSplit = split(data, '='); name = nameValueSplit[0]; - if(nameValueSplit.length > 1) { - value = nameValueSplit[1]; - } - else{ - System.out.println("ISD: Found issue where no objvar value was set."); - System.out.println("ISD: ObjVar: " + name); - System.out.println("ISD: Original objvarString: " + objvarString); - System.out.println("ISD: newObject obj_id value: " + newObject.toString()); - value = ""; - } + value = nameValueSplit[1]; + if (type.equals("int")) { setObjVar(newObject, name, utils.stringToInt(value)); } else if (type.equals("float")) {