From c4d8ebaa66c7a642b63a62880a1e81174ec438b2 Mon Sep 17 00:00:00 2001 From: Cekis Date: Sun, 29 Jan 2017 06:20:30 +0000 Subject: [PATCH] Fixed issue where NPCs with Recruiter status must be either Rebel or Imperial. --- .../faction_recruiter/faction_recruiter.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/npc/faction_recruiter/faction_recruiter.java diff --git a/sku.0/sys.server/compiled/game/script/npc/faction_recruiter/faction_recruiter.java b/sku.0/sys.server/compiled/game/script/npc/faction_recruiter/faction_recruiter.java old mode 100644 new mode 100755 index d22cbb741..c4d9414fd --- a/sku.0/sys.server/compiled/game/script/npc/faction_recruiter/faction_recruiter.java +++ b/sku.0/sys.server/compiled/game/script/npc/faction_recruiter/faction_recruiter.java @@ -149,20 +149,11 @@ public class faction_recruiter extends script.base_script { if (hasObjVar(self, VAR_FACTION)) { - if (!hasScript(self, "systems.gcw.gcw_data_updater")) - { - attachScript(self, "systems.gcw.gcw_data_updater"); - } if (hasScript(self, "conversation.faction_recruiter_general")) { detachScript(self, "conversation.faction_recruiter_general"); } String faction = getStringObjVar(self, VAR_FACTION); - String strScript = "conversation.faction_recruiter_" + toLower(faction); - if (!hasScript(self, strScript)) - { - attachScript(self, strScript); - } int faction_id = getFactionId(faction); if (faction_id == 0) { @@ -176,6 +167,15 @@ public class faction_recruiter extends script.base_script } else { + if (!hasScript(self, "systems.gcw.gcw_data_updater")) + { + attachScript(self, "systems.gcw.gcw_data_updater"); + } + String strScript = "conversation.faction_recruiter_" + toLower(faction); + if (!hasScript(self, strScript)) + { + attachScript(self, strScript); + } pvpSetAlignedFaction(self, faction_id); pvpMakeDeclared(self); if (isInvulnerable(self))