swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-10-11 02:12:59 -04:00
Code Issues Projects Releases Wiki Activity

Fixed issue where NPCs with Recruiter status must be either Rebel or Imperial.

Browse Source
This commit is contained in:
Cekis
2017-01-29 06:20:30 +00:00
parent 18db28fbd4
commit c4d8ebaa66
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/npc/faction_recruiter/faction_recruiter.java
Regular → Executable
+9 -9
View File
@@ -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))