projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-03 04:16:19 -04:00
Code Issues Projects Releases Wiki Activity

Fixed #245, also uncommented skill mod deltas

Browse Source
This commit is contained in:
Seefo
2014-03-26 19:20:05 -04:00
parent a46847d0fd
commit e60ffb32c5
6 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CombatService.java
+8 -5
View File
@@ -990,8 +990,9 @@ public class CombatService implements INetworkDispatch {
attacker.removeDefender(target);
target.removeDefender(attacker);
core.playerService.sendCloningWindow(target, attacker.getSlottedObject("ghost") != null);
if(target.getDuelList().contains(attacker)) handleEndDuel(target, attacker, false);
core.playerService.sendCloningWindow(target, attacker.getSlottedObject("ghost") != null);
}
public boolean areInDuel(CreatureObject creature1, CreatureObject creature2) {
@@ -1000,7 +1001,6 @@ public class CombatService implements INetworkDispatch {
return true;
return false;
}
public void handleDuel(CreatureObject requester, CreatureObject target) {
@@ -1025,7 +1025,7 @@ public class CombatService implements INetworkDispatch {
}
public void handleEndDuel(CreatureObject requester, CreatureObject target) {
public void handleEndDuel(CreatureObject requester, CreatureObject target, boolean announce) {
requester.getDuelList().remove(target);
target.getDuelList().remove(requester);
@@ -1036,8 +1036,11 @@ public class CombatService implements INetworkDispatch {
target.getClient().getSession().write(new UpdatePVPStatusMessage(requester.getObjectID(), 0x16, requester.getFaction()).serialize());
requester.getClient().getSession().write(new UpdatePVPStatusMessage(target.getObjectID(), 0x16, target.getFaction()).serialize());
requester.sendSystemMessage("You end your duel with " + target.getCustomName() + ".", (byte) 0);
target.sendSystemMessage(requester.getCustomName() + " ends your duel.", (byte) 0);
if(announce)
{
requester.sendSystemMessage("You end your duel with " + target.getCustomName() + ".", (byte) 0);
target.sendSystemMessage(requester.getCustomName() + " ends your duel.", (byte) 0);
}
}