diff --git a/sku.0/sys.server/compiled/game/script/conversation/greeter_coronet_merchant.java b/sku.0/sys.server/compiled/game/script/conversation/greeter_coronet_merchant.java old mode 100644 new mode 100755 index 0da750cef..f3a063d05 --- a/sku.0/sys.server/compiled/game/script/conversation/greeter_coronet_merchant.java +++ b/sku.0/sys.server/compiled/game/script/conversation/greeter_coronet_merchant.java @@ -34,10 +34,6 @@ public class greeter_coronet_merchant extends script.base_script { return true; } - if (groundquests.isTaskActive(player, "corellia_coronet_capitol_problems_missing_shipment_intro", "ralMundi_getSchedule") && (groundquests.isTaskActive(player, "corellia_coronet_capitol_problems_missing_shipment_intro", "ralMundi_getInvoice") || groundquests.isTaskActive(player, "corellia_coronet_capitol_problems_missing_shipment_intro", "ralMundi_gaveTool"))) - { - return true; - } return false; } public boolean greeter_coronet_merchant_condition_getSchedule(obj_id player, obj_id npc) throws InterruptedException @@ -46,10 +42,6 @@ public class greeter_coronet_merchant extends script.base_script { return true; } - if (groundquests.isTaskActive(player, "corellia_coronet_capitol_problems_missing_shipment_intro", "ralMundi_getSchedule") && groundquests.hasCompletedTask(player, "corellia_coronet_capitol_problems_missing_shipment_intro", "ralMundi_gaveTool")) - { - return true; - } return false; } public boolean greeter_coronet_merchant_condition_getInvoice(obj_id player, obj_id npc) throws InterruptedException @@ -58,10 +50,6 @@ public class greeter_coronet_merchant extends script.base_script { return true; } - if (groundquests.hasCompletedTask(player, "corellia_coronet_capitol_problems_missing_shipment_intro", "ralMundi_getSchedule") && (groundquests.isTaskActive(player, "corellia_coronet_capitol_problems_missing_shipment_intro", "ralMundi_getInvoice") || groundquests.isTaskActive(player, "corellia_coronet_capitol_problems_missing_shipment_intro", "ralMundi_gaveTool"))) - { - return true; - } return false; } public boolean greeter_coronet_merchant_condition_faliedSpaceQuest(obj_id player, obj_id npc) throws InterruptedException