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

Fixed cooldown reset for healing a target with full health

Browse Source
This commit is contained in:
Light2
2013-09-22 19:27:56 +02:00
parent 110f8ae237
commit 2f7c2290df
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CombatService.java
+5 -3
View File
@@ -91,6 +91,7 @@ public class CombatService implements INetworkDispatch {
session.write(new ObjControllerMessage(0x0B, commandRemove).serialize());
StartTask startTask = new StartTask(actionCounter, attacker.getObjectID(), command.getCommandCRC(), CRC.StringtoCRC(command.getCooldownGroup()), -1);
session.write(new ObjControllerMessage(0x0B, startTask).serialize());
return;
}
/* // use preRun for delayed effects like officer orbital strike, grenades etc.
@@ -762,15 +763,16 @@ public class CombatService implements INetworkDispatch {
if((command.getAttackType() == 0 || command.getAttackType() == 1 || command.getAttackType() == 3) && !attemptHeal(healer, target))
success = false;
if(command.getAttackType() == 1 && target.getMaxHealth() == target.getHealth())
success = false;
if(target.getMaxHealth() == target.getHealth())
success = command.getAttackType() != 1;
if(!success) {
IoSession session = healer.getClient().getSession();
CommandEnqueueRemove commandRemove = new CommandEnqueueRemove(healer.getObjectId(), actionCounter);
session.write(new ObjControllerMessage(0x0B, commandRemove).serialize());
StartTask startTask = new StartTask(actionCounter, healer.getObjectID(), command.getCommandCRC(), CRC.StringtoCRC(command.getCooldownGroup()), -1);
session.write(new ObjControllerMessage(0x0B, startTask).serialize());
return;
}
if(command.getAttackType() == 1)