projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-08 23:13:25 -04:00
Code Issues Projects Releases Wiki Activity

Merged in DaddyAP/holocore (pull request #483)

Browse Source 
Replaced const regen rate with creature regen rate
This commit is contained in:
DaddyAP
2017-06-29 22:09:37 +00:00
committed by Obique PSWG
parent 1a7fad2fef 12b17a746e
commit baee2f04b7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/combat/CombatManager.java
+2 -2
View File
@@ -189,7 +189,7 @@ public class CombatManager extends Manager {
private void regenerationActionTick(CreatureObject creatureObject, Iterator<CreatureObject> iterator) {
if(creatureObject.getAction() < creatureObject.getMaxAction()) {
int modification = 13;
int modification = creatureObject.getSkillModValue("action_regen");
int level = creatureObject.getLevel();
if(level > 1) {
@@ -209,7 +209,7 @@ public class CombatManager extends Manager {
private void regenerationHealthTick(CreatureObject creatureObject, Iterator<CreatureObject> iterator) {
if(creatureObject.getHealth() < creatureObject.getMaxHealth()) {
int modification = 40;
int modification = creatureObject.getSkillModValue("health_regen");
int level = creatureObject.getLevel();
if (level > 1) {