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

Bounty mark will enter combat now if attacked, entering combat will now break stealth

Browse Source
This commit is contained in:
Waverunner
2014-05-06 20:34:35 -04:00
parent 4e36321ca3
commit 892f9cb7db
5 changed files with 73 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objectives/BountyMissionObjective.java
+9 -8
View File
@@ -79,7 +79,7 @@ public class BountyMissionObjective extends MissionObjective {
if (isActivated())
return;
BountyListItem bountyTarget = core.missionService.getBountyListItem(getMissionObject().getBountyObjId());
BountyListItem bountyTarget = core.missionService.getBountyListItem(getMissionObject().getBountyMarkId());
if (bountyTarget == null) {
core.missionService.handleMissionAbort(player, getMissionObject());
@@ -87,7 +87,7 @@ public class BountyMissionObjective extends MissionObjective {
return;
}
bountyTarget.addBountyHunter(player.getObjectId());
bountyTarget.addBountyHunter(player.getObjectID());
setMarkObjId(bountyTarget.getObjectID());
@@ -111,11 +111,7 @@ public class BountyMissionObjective extends MissionObjective {
player.getPlayerObject().setBountyMissionId(getMissionObject().getObjectId());
/*CreatureObject target = (CreatureObject) core.objectService.getObject(markObjId);
if (target != null && target.getPlanetId() == player.getPlanetId()) {
UpdatePVPStatusMessage upvpm = new UpdatePVPStatusMessage(player.getObjectID(), core.factionService.calculatePvpStatus(player, target), player.getFaction());
player.getClient().getSession().write(upvpm.serialize());
}*/
player.updatePvpStatus();
}
@@ -133,12 +129,15 @@ public class BountyMissionObjective extends MissionObjective {
else
player.addBankCredits(bounty.getCreditReward());
bounty.removeBountyHunter(player.getObjectId());
notifyBountyPlacers(core, player, bounty);
clearActiveMissions(core, bounty);
core.missionService.removeBounty(markObjId);
player.getPlayerObject().setBountyMissionId(0);
player.updatePvpStatus();
}
@Override
@@ -152,6 +151,7 @@ public class BountyMissionObjective extends MissionObjective {
bounty.removeBountyHunter(player.getObjectId());
player.getPlayerObject().setBountyMissionId(0);
player.updatePvpStatus();
}
@Override
@@ -184,6 +184,7 @@ public class BountyMissionObjective extends MissionObjective {
public void clearActiveMissions(NGECore core, BountyListItem bounty) {
bounty.getAssignedHunters().forEach(id -> {
CreatureObject hunter = (CreatureObject) core.objectService.getObject(id);
if (hunter != null) {
@@ -204,7 +205,7 @@ public class BountyMissionObjective extends MissionObjective {
}
public void checkBountyActiveStatus(NGECore core) {
BountyListItem bountyTarget = core.missionService.getBountyListItem(getMissionObject().getBountyObjId());
BountyListItem bountyTarget = core.missionService.getBountyListItem(getMissionObject().getBountyMarkId());
CreatureObject player = (CreatureObject) getMissionObject().getGrandparent();
if (bountyTarget == null || !bountyTarget.getAssignedHunters().contains(player.getObjectId())) {