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

Fixed issue where space mission was unable to remove waypoint from datapad (likely because it has already been removed or quest was completed).

Browse Source
This commit is contained in:
Cekis
2016-05-23 22:59:09 +01:00
parent 1af9527562
commit 8a0742bb6a
1 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/space/quest_logic/recovery.java
Regular → Executable
+10 -20
View File
@@ -1,21 +1,7 @@
package script.space.quest_logic;
import script.*;
import script.base_class.*;
import script.combat_engine.*;
import java.util.Arrays;
import java.util.Hashtable;
import java.util.Vector;
import script.base_script;
import script.library.space_create;
import script.library.space_quest;
import script.library.space_utils;
import script.library.space_crafting;
import script.library.space_transition;
import script.library.utils;
import script.library.ship_ai;
import script.library.prose;
import script.library.*;
public class recovery extends script.base_script
{
@@ -494,6 +480,9 @@ public class recovery extends script.base_script
}
public int updateTargetWaypoint(obj_id self, dictionary params) throws InterruptedException
{
if(self == null || self == obj_id.NULL_ID || !isIdValid(self)){
return SCRIPT_CONTINUE;
}
obj_id player = getObjIdObjVar(self, space_quest.QUEST_OWNER);
obj_id ship = getObjIdObjVar(self, "target");
obj_id waypoint = getObjIdObjVar(self, "waypoint");
@@ -520,11 +509,12 @@ public class recovery extends script.base_script
}
public void clearMissionWaypoint(obj_id self) throws InterruptedException
{
obj_id player = getObjIdObjVar(self, space_quest.QUEST_OWNER);
obj_id waypoint = getObjIdObjVar(self, "waypoint");
if (isIdValid(waypoint))
{
destroyWaypointInDatapad(waypoint, player);
if(isIdValid(self)) {
obj_id player = getObjIdObjVar(self, space_quest.QUEST_OWNER);
obj_id waypoint = getObjIdObjVar(self, "waypoint");
if (isIdValid(waypoint) && isIdValid(player)) {
destroyWaypointInDatapad(waypoint, player);
}
}
}
public void questCompleted(obj_id self) throws InterruptedException