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

Merge pull request #357 from GeneUNCG/patch-1

Browse Source 
Fixed issue #349
This commit is contained in:
Josh Larson
2021-05-26 18:21:47 -05:00
committed by GitHub
parent 09c784a5ec 3e02b05f4d
commit 2490174a25
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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