projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-31 01:15:57 -04:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Ziggeh
2014-03-29 14:17:58 +01:00
parent e39b6b498d 9ff669832b
commit 5ea7a1497d
6 changed files with 74 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CombatService.java
+4 -4
View File
@@ -1005,8 +1005,8 @@ public class CombatService implements INetworkDispatch {
requester.getDuelList().add(target);
requester.sendSystemMessage("You accept " + target.getCustomName() + "'s challenge.", (byte) 0);
target.sendSystemMessage(requester.getCustomName() + " accepts your challenge.", (byte) 0);
target.getClient().getSession().write(new UpdatePVPStatusMessage(requester.getObjectID(), 55, requester.getFaction()).serialize());
requester.getClient().getSession().write(new UpdatePVPStatusMessage(target.getObjectID(), 55, target.getFaction()).serialize());
target.updatePvpStatus();
requester.updatePvpStatus();
}
@@ -1021,8 +1021,8 @@ public class CombatService implements INetworkDispatch {
target.removeDefender(requester);
requester.removeDefender(target);
target.getClient().getSession().write(new UpdatePVPStatusMessage(requester.getObjectID(), 0x16, requester.getFaction()).serialize());
requester.getClient().getSession().write(new UpdatePVPStatusMessage(target.getObjectID(), 0x16, target.getFaction()).serialize());
target.updatePvpStatus();
requester.updatePvpStatus();
if(announce)
{