Fixed vitality not decreasing if you had items with negative consumption rate.
Contributed by facab.
This commit is contained in:
parent
31ae41bb48
commit
b07848fb1e
@ -547,15 +547,12 @@ public class PlayerStat extends PlayableStat
|
|||||||
|
|
||||||
if (points < 0) // vitality consumed
|
if (points < 0) // vitality consumed
|
||||||
{
|
{
|
||||||
final int stat = (int) getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
double consumeRate = getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
||||||
if (stat == 0)
|
if (consumeRate <= 0)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (stat < 0)
|
points *= consumeRate;
|
||||||
{
|
|
||||||
points = -points;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (points > 0)
|
if (points > 0)
|
||||||
|
@ -549,15 +549,12 @@ public class PlayerStat extends PlayableStat
|
|||||||
|
|
||||||
if (points < 0) // vitality consumed
|
if (points < 0) // vitality consumed
|
||||||
{
|
{
|
||||||
final int stat = (int) getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
double consumeRate = getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
||||||
if (stat == 0)
|
if (consumeRate <= 0)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (stat < 0)
|
points *= consumeRate;
|
||||||
{
|
|
||||||
points = -points;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (points > 0)
|
if (points > 0)
|
||||||
|
@ -549,15 +549,12 @@ public class PlayerStat extends PlayableStat
|
|||||||
|
|
||||||
if (points < 0) // vitality consumed
|
if (points < 0) // vitality consumed
|
||||||
{
|
{
|
||||||
final int stat = (int) getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
double consumeRate = getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
||||||
if (stat == 0)
|
if (consumeRate <= 0)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (stat < 0)
|
points *= consumeRate;
|
||||||
{
|
|
||||||
points = -points;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (points > 0)
|
if (points > 0)
|
||||||
|
@ -544,15 +544,12 @@ public class PlayerStat extends PlayableStat
|
|||||||
|
|
||||||
if (points < 0) // vitality consumed
|
if (points < 0) // vitality consumed
|
||||||
{
|
{
|
||||||
final int stat = (int) getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
double consumeRate = getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
||||||
if (stat == 0)
|
if (consumeRate <= 0)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (stat < 0)
|
points *= consumeRate;
|
||||||
{
|
|
||||||
points = -points;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (points > 0)
|
if (points > 0)
|
||||||
|
@ -550,15 +550,12 @@ public class PlayerStat extends PlayableStat
|
|||||||
|
|
||||||
if (points < 0) // vitality consumed
|
if (points < 0) // vitality consumed
|
||||||
{
|
{
|
||||||
final int stat = (int) getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
double consumeRate = getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
||||||
if (stat == 0)
|
if (consumeRate <= 0)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (stat < 0)
|
points *= consumeRate;
|
||||||
{
|
|
||||||
points = -points;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (points > 0)
|
if (points > 0)
|
||||||
|
@ -550,15 +550,12 @@ public class PlayerStat extends PlayableStat
|
|||||||
|
|
||||||
if (points < 0) // vitality consumed
|
if (points < 0) // vitality consumed
|
||||||
{
|
{
|
||||||
final int stat = (int) getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
double consumeRate = getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
||||||
if (stat == 0)
|
if (consumeRate <= 0)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (stat < 0)
|
points *= consumeRate;
|
||||||
{
|
|
||||||
points = -points;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (points > 0)
|
if (points > 0)
|
||||||
|
@ -550,15 +550,12 @@ public class PlayerStat extends PlayableStat
|
|||||||
|
|
||||||
if (points < 0) // vitality consumed
|
if (points < 0) // vitality consumed
|
||||||
{
|
{
|
||||||
final int stat = (int) getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
double consumeRate = getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
||||||
if (stat == 0)
|
if (consumeRate <= 0)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (stat < 0)
|
points *= consumeRate;
|
||||||
{
|
|
||||||
points = -points;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (points > 0)
|
if (points > 0)
|
||||||
|
@ -548,15 +548,12 @@ public class PlayerStat extends PlayableStat
|
|||||||
|
|
||||||
if (points < 0) // vitality consumed
|
if (points < 0) // vitality consumed
|
||||||
{
|
{
|
||||||
final int stat = (int) getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
double consumeRate = getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
||||||
if (stat == 0)
|
if (consumeRate <= 0)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (stat < 0)
|
points *= consumeRate;
|
||||||
{
|
|
||||||
points = -points;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (points > 0)
|
if (points > 0)
|
||||||
|
@ -544,15 +544,12 @@ public class PlayerStat extends PlayableStat
|
|||||||
|
|
||||||
if (points < 0) // vitality consumed
|
if (points < 0) // vitality consumed
|
||||||
{
|
{
|
||||||
final int stat = (int) getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
double consumeRate = getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
||||||
if (stat == 0)
|
if (consumeRate <= 0)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (stat < 0)
|
points *= consumeRate;
|
||||||
{
|
|
||||||
points = -points;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (points > 0)
|
if (points > 0)
|
||||||
|
@ -544,15 +544,12 @@ public class PlayerStat extends PlayableStat
|
|||||||
|
|
||||||
if (points < 0) // vitality consumed
|
if (points < 0) // vitality consumed
|
||||||
{
|
{
|
||||||
final int stat = (int) getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
double consumeRate = getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
||||||
if (stat == 0)
|
if (consumeRate <= 0)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (stat < 0)
|
points *= consumeRate;
|
||||||
{
|
|
||||||
points = -points;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (points > 0)
|
if (points > 0)
|
||||||
|
@ -544,15 +544,12 @@ public class PlayerStat extends PlayableStat
|
|||||||
|
|
||||||
if (points < 0) // vitality consumed
|
if (points < 0) // vitality consumed
|
||||||
{
|
{
|
||||||
final int stat = (int) getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
double consumeRate = getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
||||||
if (stat == 0)
|
if (consumeRate <= 0)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (stat < 0)
|
points *= consumeRate;
|
||||||
{
|
|
||||||
points = -points;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (points > 0)
|
if (points > 0)
|
||||||
|
@ -545,15 +545,12 @@ public class PlayerStat extends PlayableStat
|
|||||||
|
|
||||||
if (points < 0) // vitality consumed
|
if (points < 0) // vitality consumed
|
||||||
{
|
{
|
||||||
final int stat = (int) getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
double consumeRate = getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
||||||
if (stat == 0)
|
if (consumeRate <= 0)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (stat < 0)
|
points *= consumeRate;
|
||||||
{
|
|
||||||
points = -points;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (points > 0)
|
if (points > 0)
|
||||||
|
@ -545,15 +545,12 @@ public class PlayerStat extends PlayableStat
|
|||||||
|
|
||||||
if (points < 0) // vitality consumed
|
if (points < 0) // vitality consumed
|
||||||
{
|
{
|
||||||
final int stat = (int) getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
double consumeRate = getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
||||||
if (stat == 0)
|
if (consumeRate <= 0)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (stat < 0)
|
points *= consumeRate;
|
||||||
{
|
|
||||||
points = -points;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (points > 0)
|
if (points > 0)
|
||||||
|
@ -543,15 +543,12 @@ public class PlayerStat extends PlayableStat
|
|||||||
|
|
||||||
if (points < 0) // vitality consumed
|
if (points < 0) // vitality consumed
|
||||||
{
|
{
|
||||||
final int stat = (int) getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
double consumeRate = getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
||||||
if (stat == 0)
|
if (consumeRate <= 0)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (stat < 0)
|
points *= consumeRate;
|
||||||
{
|
|
||||||
points = -points;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (points > 0)
|
if (points > 0)
|
||||||
|
@ -544,15 +544,12 @@ public class PlayerStat extends PlayableStat
|
|||||||
|
|
||||||
if (points < 0) // vitality consumed
|
if (points < 0) // vitality consumed
|
||||||
{
|
{
|
||||||
final int stat = (int) getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
double consumeRate = getValue(Stat.VITALITY_CONSUME_RATE, 1);
|
||||||
if (stat == 0)
|
if (consumeRate <= 0)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (stat < 0)
|
points *= consumeRate;
|
||||||
{
|
|
||||||
points = -points;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (points > 0)
|
if (points > 0)
|
||||||
|
Loading…
Reference in New Issue
Block a user