From 7b14c94d40084b48a04ec9d7cdeb0abf493947eb Mon Sep 17 00:00:00 2001 From: Waverunner Date: Tue, 6 May 2014 17:27:06 -0400 Subject: [PATCH] Fixed #621, added missing sys message for tracking droids, fixed bounties db null error & wp null error --- scripts/commands/setwaypointactivestatus.py | 4 ++++ src/resources/objectives/BountyMissionObjective.java | 6 +++--- src/resources/objects/tangible/TangibleObject.java | 2 +- src/services/mission/MissionService.java | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/commands/setwaypointactivestatus.py b/scripts/commands/setwaypointactivestatus.py index 70d5b50c..24199d36 100644 --- a/scripts/commands/setwaypointactivestatus.py +++ b/scripts/commands/setwaypointactivestatus.py @@ -9,6 +9,10 @@ def run(core, actor, target, commandString): return waypointTarget = core.objectService.getObject(target.getObjectID()) wp = playerObject.getWaypointFromList(target) + + if wp is None: + return + if wp.isActive() == True: wp.setActive(False) playerObject.waypointUpdate(wp) diff --git a/src/resources/objectives/BountyMissionObjective.java b/src/resources/objectives/BountyMissionObjective.java index 09a928f4..9dfaefac 100644 --- a/src/resources/objectives/BountyMissionObjective.java +++ b/src/resources/objectives/BountyMissionObjective.java @@ -289,7 +289,7 @@ public class BountyMissionObjective extends MissionObjective { return; } else { - if (updates.get() >= 5) { + if (updates.get() >= 6) { actor.sendSystemMessage("@mission/mission_generic:target_track_lost", DisplayType.Broadcast); cancelLocationUpdates(); return; @@ -306,12 +306,12 @@ public class BountyMissionObjective extends MissionObjective { waypoint.setPlanetCRC(CRC.StringtoCRC(target.getPlanet().getName())); waypoint.setStringAttribute("", ""); getMissionObject().setAttachedWaypoint(waypoint); - actor.sendSystemMessage("@mission/mission_generic:target_location_updated_ground", DisplayType.Broadcast); } else { missionWp.setPosition(target.getWorldPosition()); mission.setAttachedWaypoint(missionWp); - actor.sendSystemMessage("@mission/mission_generic:target_location_updated_ground", DisplayType.Broadcast); } + actor.sendSystemMessage("@mission/mission_generic:target_location_updated_ground", DisplayType.Broadcast); + actor.sendSystemMessage("@mission/mission_generic:target_continue_tracking", DisplayType.Broadcast); updates.getAndIncrement(); } } diff --git a/src/resources/objects/tangible/TangibleObject.java b/src/resources/objects/tangible/TangibleObject.java index 9ed60956..b946f58d 100644 --- a/src/resources/objects/tangible/TangibleObject.java +++ b/src/resources/objects/tangible/TangibleObject.java @@ -179,7 +179,7 @@ public class TangibleObject extends SWGObject implements Serializable { this.customization = customization; } - notifyObservers(messageBuilder.buildCustomizationDelta(customization), false); + notifyObservers(messageBuilder.buildCustomizationDelta(customization), true); } public List getComponentCustomizations() { diff --git a/src/services/mission/MissionService.java b/src/services/mission/MissionService.java index a4fc802b..6e2f289c 100644 --- a/src/services/mission/MissionService.java +++ b/src/services/mission/MissionService.java @@ -585,7 +585,8 @@ public class MissionService implements INetworkDispatch { ODBCursor cursor = bountiesODB.getCursor(); while(cursor.hasNext()) { BountyListItem bounty = (BountyListItem) cursor.next(); - if (!core.characterService.playerExists(bounty.getObjectId())) { + + if (bounty != null && !core.characterService.playerExists(bounty.getObjectId())) { bounties.add(bounty); } }