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

Part of last commit

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

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

@@ -142,12 +142,14 @@ enum CombatCommandHeal implements CombatCommandHitType {
switch (combatCommand.getHealAttrib()) {
case HEALTH: {
if (healed.getHealth() == healed.getMaxHealth()) {
// Pointless to heal health if health is already full
int currentHealth = healed.getHealth();
int maxHealth = healed.getMaxHealth();
if (currentHealth == maxHealth) {
// Pointless to heal health if it's already full
return;
}
int currentHealth = healed.getHealth();
healed.modifyHealth(healAmount);
difference = healed.getHealth() - currentHealth;
attribName = "HEALTH";
@@ -156,12 +158,14 @@ enum CombatCommandHeal implements CombatCommandHitType {
}
case ACTION: {
if (healed.getAction() == healed.getMaxAction()) {
// Pointless to heal action if health is already full
int currentAction = healed.getAction();
int maxAction = health.getMaxAction();
if (currentAction == maxAction) {
// Pointless to heal action if it's already full
return;
}
int currentAction = healed.getAction();
healed.modifyAction(healAmount);
difference = healed.getAction() - currentAction;
attribName = "ACTION";