projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-11 21:45:43 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #113 from Ziggeh/master

Browse Source 
Some general fixes
This commit is contained in:
Waverunner
2013-12-07 14:31:34 -08:00
parent a2c94acaf8 4039379583
commit 7fbd1206ab
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/commands/requestwaypointatposition.py
+1 -1
View File
@@ -7,7 +7,7 @@ def run(core, actor, target, commandString):
commandArgs = commandString.split("(^-,=+_)color_13548(,+-=_^)=1")
newString = commandArgs[1]
newString = commandArgs[0]
print (newString)
cmdService = core.commandService
cmdService.callCommand(actor, 'waypoint', None, newString) # No need to re-create a script
src/services/combat/CombatService.java
+11 -1
View File
@@ -405,11 +405,21 @@ public class CombatService implements INetworkDispatch {
private void sendHealPackets(CreatureObject attacker, CreatureObject target, WeaponObject weapon, CombatCommand command, int actionCounter) {
float cooldown = 0;
CombatAction combatAction = new CombatAction(CRC.StringtoCRC(command.getDefaultAnimations()[0]), attacker.getObjectID(), weapon.getObjectID(), target.getObjectID(), command.getCommandCRC());
ObjControllerMessage objController = new ObjControllerMessage(0x1B, combatAction);
attacker.notifyObserversInRange(objController, true, 125);
StartTask startTask = new StartTask(actionCounter, attacker.getObjectID(), command.getCommandCRC(), CRC.StringtoCRC(command.getCooldownGroup()), command.getCooldown());
cooldown = command.getCooldown();
System.out.println(cooldown);
if(attacker.getSkillMod("expertise_cooldown_line_of_heal") != null)
cooldown -= attacker.getSkillMod("expertise_cooldown_line_of_heal").getBase();
if(attacker.getSkillMod("expertise_cooldown_line_sh") != null)
cooldown -= ((attacker.getSkillMod("expertise_cooldown_line_sh").getBase())/10);
StartTask startTask = new StartTask(actionCounter, attacker.getObjectID(), command.getCommandCRC(), CRC.StringtoCRC(command.getCooldownGroup()), cooldown);
ObjControllerMessage objController2 = new ObjControllerMessage(0x0B, startTask);
attacker.getClient().getSession().write(objController2.serialize());