projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-01-15 23:05:45 -05:00
Code Issues Projects Releases Wiki Activity

This is actually the real fix (includes action too)

Browse Source
This commit is contained in:
Gene Pressinger
2021-05-26 18:53:52 -04:00
committed by GitHub
parent a02b19ac00
commit 4ce1a5fad1
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/projectswg/holocore/services/gameplay/combat/command/CombatCommandHeal.java
View File

@@ -64,11 +64,6 @@ enum CombatCommandHeal implements CombatCommandHitType {
// Apply special line heal boost
healAmount += CombatCommandCommon.getAddedDamageBoost(source, combatCommand);
if (healAmount <= 0) {
// Pointless to calculate who gets healed if we aren't healing any amount
return;
}
switch (combatCommand.getAttackType()) {
case SINGLE_TARGET: {
switch (combatCommand.getTargetType()) {
@@ -147,6 +142,11 @@ enum CombatCommandHeal implements CombatCommandHitType {
switch (combatCommand.getHealAttrib()) {
case HEALTH: {
if (healed.getHealth() == healed.getMaxHealth()) {
// Pointless to heal health if health is already full
return;
}
int currentHealth = healed.getHealth();
healed.modifyHealth(healAmount);
difference = healed.getHealth() - currentHealth;
@@ -156,6 +156,11 @@ enum CombatCommandHeal implements CombatCommandHitType {
}
case ACTION: {
if (healed.getAction() == healed.getMaxAction()) {
// Pointless to heal action if health is already full
return;
}
int currentAction = healed.getAction();
healed.modifyAction(healAmount);
difference = healed.getAction() - currentAction;