swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-07-31 00:15:54 -04:00
Code Issues Projects Releases Wiki Activity

Fixed issue occurring when Restuss space mining missions are granted.

Browse Source
This commit is contained in:
Cekis
2018-03-23 15:58:48 -07:00
committed by CekisSWG
parent bcc5439cc7
commit 61cce67d59
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/conversation/restuss_imperial_space_mining.java
Regular → Executable
+2 -2
View File
@@ -139,7 +139,7 @@ public class restuss_imperial_space_mining extends script.base_script
public void restuss_imperial_space_mining_action_giveSpaceMine1(obj_id player, obj_id npc) throws InterruptedException
{
obj_id mobj = space_quest._getQuest(player, "space_mining_destroy", "restuss_imperial_mining_1");
space_quest.setSilentQuestAborted(player, mobj);
if (mobj != null) space_quest.setSilentQuestAborted(player, mobj);
groundquests.clearQuest(player, "restuss_imperial_space_mining_1");
groundquests.grantQuest(player, "restuss_imperial_space_mining_1");
}
@@ -202,7 +202,7 @@ public class restuss_imperial_space_mining extends script.base_script
public void restuss_imperial_space_mining_action_giveSpaceMine2(obj_id player, obj_id npc) throws InterruptedException
{
obj_id mobj = space_quest._getQuest(player, "space_mining_destroy", "restuss_imperial_mining_2");
space_quest.setSilentQuestAborted(player, mobj);
if (mobj != null) space_quest.setSilentQuestAborted(player, mobj);
groundquests.clearQuest(player, "restuss_imperial_space_mining_2");
groundquests.grantQuest(player, "restuss_imperial_space_mining_2");
}
sku.0/sys.server/compiled/game/script/conversation/restuss_rebel_space_destroy.java
Regular → Executable
+2 -2
View File
@@ -107,7 +107,7 @@ public class restuss_rebel_space_destroy extends script.base_script
public void restuss_rebel_space_destroy_action_givekill1(obj_id player, obj_id npc) throws InterruptedException
{
obj_id mobj = space_quest._getQuest(player, "destroy", "restuss_rebel_destroy_1");
space_quest.setSilentQuestAborted(player, mobj);
if (mobj != null) space_quest.setSilentQuestAborted(player, mobj);
groundquests.clearQuest(player, "restuss_rebel_space_destroy_1");
groundquests.grantQuest(player, "restuss_rebel_space_destroy_1");
}
@@ -137,7 +137,7 @@ public class restuss_rebel_space_destroy extends script.base_script
public void restuss_rebel_space_destroy_action_givekill2(obj_id player, obj_id npc) throws InterruptedException
{
obj_id mobj = space_quest._getQuest(player, "destroy", "restuss_rebel_destroy_2");
space_quest.setSilentQuestAborted(player, mobj);
if (mobj != null) space_quest.setSilentQuestAborted(player, mobj);
groundquests.clearQuest(player, "restuss_rebel_space_destroy_2");
groundquests.grantQuest(player, "restuss_rebel_space_destroy_2");
}
sku.0/sys.server/compiled/game/script/conversation/restuss_rebel_space_mining.java
Regular → Executable
+2 -2
View File
@@ -150,7 +150,7 @@ public class restuss_rebel_space_mining extends script.base_script
public void restuss_rebel_space_mining_action_giveSpaceMine1(obj_id player, obj_id npc) throws InterruptedException
{
obj_id mobj = space_quest._getQuest(player, "space_mining_destroy", "restuss_rebel_mining_1");
space_quest.setSilentQuestAborted(player, mobj);
if (mobj != null) space_quest.setSilentQuestAborted(player, mobj);
groundquests.clearQuest(player, "restuss_rebel_space_mining_1");
groundquests.grantQuest(player, "restuss_rebel_space_mining_1");
}
@@ -213,7 +213,7 @@ public class restuss_rebel_space_mining extends script.base_script
public void restuss_rebel_space_mining_action_giveSpaceMine2(obj_id player, obj_id npc) throws InterruptedException
{
obj_id mobj = space_quest._getQuest(player, "space_mining_destroy", "restuss_rebel_mining_2");
space_quest.setSilentQuestAborted(player, mobj);
if (mobj != null) space_quest.setSilentQuestAborted(player, mobj);
groundquests.clearQuest(player, "restuss_rebel_space_mining_2");
groundquests.grantQuest(player, "restuss_rebel_space_mining_2");
}