projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-12 02:13:48 -04:00
Code Issues Projects Releases Wiki Activity

Fixed #621, added missing sys message for tracking droids, fixed bounties db null error & wp null error

Browse Source
This commit is contained in:
Waverunner
2014-05-06 17:27:06 -04:00
parent cfe65a9613
commit 7b14c94d40
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/commands/setwaypointactivestatus.py
+4
View File
@@ -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)
src/resources/objectives/BountyMissionObjective.java
+3 -3
View File
@@ -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();
}
}
src/resources/objects/tangible/TangibleObject.java
+1 -1
View File
@@ -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<Integer> getComponentCustomizations() {
src/services/mission/MissionService.java
+2 -1
View File
@@ -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);
}
}