projectswg-bitbucket/holocore
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/holocore.git synced 2026-01-16 23:04:20 -05:00
Code Issues Projects Releases Wiki Activity

Merged in M4SS/holocore/196 (pull request #671)

Browse Source 
#196: Fix combat exploit where modifying health or action during combat would replenish the pools to 100%
This commit is contained in:
Mads Boddum
2019-10-18 14:57:38 +00:00
committed by Obique PSWG
parent 2d0a6293b8 b30250fa0a
commit c12fd009f4
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/projectswg/holocore/services/gameplay/player/experience/skills/skillmod/SkillModService.java
View File

@@ -216,12 +216,20 @@ public class SkillModService extends Service {
if (newHealth != 0){
creature.setMaxHealth(creature.getMaxHealth() + newHealth);
creature.setHealth(creature.getMaxHealth());
if (!creature.isInCombat()) {
// Don't replenish health to 100% if creature is in combat
creature.setHealth(creature.getMaxHealth());
}
}
if (newAction !=0){
creature.setMaxAction(creature.getMaxAction() + newAction);
creature.setAction(creature.getMaxAction());
if (!creature.isInCombat()) {
// Don't replenish action to 100% if creature is in combat
creature.setAction(creature.getMaxAction());
}
}
}