Method needHpUpdate simplification.
This commit is contained in:
@@ -694,7 +694,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true if hp update should be done, false if not
|
||||
* @return true if hp update should be done, false if not.
|
||||
*/
|
||||
protected boolean needHpUpdate()
|
||||
{
|
||||
@@ -705,9 +705,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
return true;
|
||||
}
|
||||
|
||||
if ((currentHp < _hpUpdateDecCheck) || (Math.abs(currentHp - _hpUpdateDecCheck) <= 1e-6) || (currentHp > _hpUpdateIncCheck) || (Math.abs(currentHp - _hpUpdateIncCheck) <= 1e-6))
|
||||
if ((currentHp <= _hpUpdateDecCheck) || (currentHp >= _hpUpdateIncCheck))
|
||||
{
|
||||
if (Math.abs(currentHp - maxHp) <= 1e-6)
|
||||
if (currentHp == maxHp)
|
||||
{
|
||||
_hpUpdateIncCheck = currentHp + 1;
|
||||
_hpUpdateDecCheck = currentHp - _hpUpdateInterval;
|
||||
@@ -716,7 +716,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
{
|
||||
final double doubleMulti = currentHp / _hpUpdateInterval;
|
||||
int intMulti = (int) doubleMulti;
|
||||
_hpUpdateDecCheck = _hpUpdateInterval * (doubleMulti < intMulti ? intMulti-- : intMulti);
|
||||
_hpUpdateDecCheck = _hpUpdateInterval * (doubleMulti < intMulti ? intMulti - 1 : intMulti);
|
||||
_hpUpdateIncCheck = _hpUpdateDecCheck + _hpUpdateInterval;
|
||||
}
|
||||
|
||||
|
@@ -3998,7 +3998,7 @@ public class PlayerInstance extends Playable
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if cp update should be done, false if not
|
||||
* Returns true if cp update should be done, false if not.
|
||||
* @return boolean
|
||||
*/
|
||||
private boolean needCpUpdate()
|
||||
@@ -4020,7 +4020,7 @@ public class PlayerInstance extends Playable
|
||||
{
|
||||
final double doubleMulti = currentCp / _cpUpdateInterval;
|
||||
int intMulti = (int) doubleMulti;
|
||||
_cpUpdateDecCheck = _cpUpdateInterval * (doubleMulti < intMulti ? intMulti-- : intMulti);
|
||||
_cpUpdateDecCheck = _cpUpdateInterval * (doubleMulti < intMulti ? intMulti - 1 : intMulti);
|
||||
_cpUpdateIncCheck = _cpUpdateDecCheck + _cpUpdateInterval;
|
||||
}
|
||||
|
||||
@@ -4031,7 +4031,7 @@ public class PlayerInstance extends Playable
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if mp update should be done, false if not
|
||||
* Returns true if mp update should be done, false if not.
|
||||
* @return boolean
|
||||
*/
|
||||
private boolean needMpUpdate()
|
||||
@@ -4053,7 +4053,7 @@ public class PlayerInstance extends Playable
|
||||
{
|
||||
final double doubleMulti = currentMp / _mpUpdateInterval;
|
||||
int intMulti = (int) doubleMulti;
|
||||
_mpUpdateDecCheck = _mpUpdateInterval * (doubleMulti < intMulti ? intMulti-- : intMulti);
|
||||
_mpUpdateDecCheck = _mpUpdateInterval * (doubleMulti < intMulti ? intMulti - 1 : intMulti);
|
||||
_mpUpdateIncCheck = _mpUpdateDecCheck + _mpUpdateInterval;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user