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

Added handling of deathblow for bounties

Browse Source
This commit is contained in:
Waverunner
2014-05-03 20:04:27 -04:00
parent 44678d8c18
commit 4831f6d8ca
7 changed files with 82 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objectives/BountyMissionObjective.java
+10 -3
View File
@@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import protocol.swg.CommPlayerMessage;
import protocol.swg.PlayClientEffectLocMessage;
import protocol.swg.UpdatePVPStatusMessage;
import engine.resources.common.CRC;
import engine.resources.container.Traverser;
import engine.resources.objects.SWGObject;
@@ -108,10 +109,16 @@ public class BountyMissionObjective extends MissionObjective {
player.getClient().getSession().write(comm.serialize());
player.setAttachment("bountyMissionId", getMissionObject().getObjectId());
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());
}*/
}
@Override
public void complete(NGECore core, CreatureObject player) {
BountyListItem bounty = core.missionService.getBountyListItem(markObjId);
@@ -131,7 +138,7 @@ public class BountyMissionObjective extends MissionObjective {
clearActiveMissions(core, bounty);
core.missionService.removeBounty(markObjId);
player.setAttachment("bountyMissionId", 0);
player.getPlayerObject().setBountyMissionId(0);
}
@Override
@@ -144,7 +151,7 @@ public class BountyMissionObjective extends MissionObjective {
return;
bounty.removeBountyHunter(player.getObjectId());
player.setAttachment("bountyMissionId", 0);
player.getPlayerObject().setBountyMissionId(0);
}
@Override