lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent vitality moving out of proper range.

Browse Source
This commit is contained in:
MobiusDev
2017-12-03 19:45:55 +00:00
parent 49e9e95340
commit 49c0634086
10 changed files with 45 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
View File

@@ -460,12 +460,12 @@ public class PcStat extends PlayableStat
{ {
return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints()); return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints());
} }
return Math.min(MAX_VITALITY_POINTS, _vitalityPoints); return Math.min(Math.max(_vitalityPoints, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
public int getBaseVitalityPoints() public int getBaseVitalityPoints()
{ {
return Math.min(MAX_VITALITY_POINTS, _vitalityPoints); return Math.min(Math.max(_vitalityPoints, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
public double getVitalityExpBonus() public double getVitalityExpBonus()
@@ -477,10 +477,10 @@ public class PcStat extends PlayableStat
{ {
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(Math.min(MAX_VITALITY_POINTS, value)); getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(value);
return; return;
} }
_vitalityPoints = Math.min(MAX_VITALITY_POINTS, value); _vitalityPoints = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
/* /*

7
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/base/SubClass.java
View File

@@ -36,6 +36,9 @@ public final class SubClass
private int _vitalityPoints = 0; private int _vitalityPoints = 0;
private boolean _dualClass = false; private boolean _dualClass = false;
public static final int MAX_VITALITY_POINTS = 140000;
public static final int MIN_VITALITY_POINTS = 0;
public SubClass() public SubClass()
{ {
// Used for specifying ALL attributes of a sub class directly, // Used for specifying ALL attributes of a sub class directly,
@@ -69,12 +72,12 @@ public final class SubClass
public int getVitalityPoints() public int getVitalityPoints()
{ {
return _vitalityPoints; return Math.min(Math.max(_vitalityPoints, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
public void setVitalityPoints(int value) public void setVitalityPoints(int value)
{ {
_vitalityPoints = value; _vitalityPoints = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
/** /**

8
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
View File

@@ -462,12 +462,12 @@ public class PcStat extends PlayableStat
{ {
return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints()); return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints());
} }
return Math.min(MAX_VITALITY_POINTS, _vitalityPoints); return Math.min(Math.max(_vitalityPoints, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
public int getBaseVitalityPoints() public int getBaseVitalityPoints()
{ {
return Math.min(MAX_VITALITY_POINTS, _vitalityPoints); return Math.min(Math.max(_vitalityPoints, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
public double getVitalityExpBonus() public double getVitalityExpBonus()
@@ -479,10 +479,10 @@ public class PcStat extends PlayableStat
{ {
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(Math.min(MAX_VITALITY_POINTS, value)); getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(value);
return; return;
} }
_vitalityPoints = Math.min(MAX_VITALITY_POINTS, value); _vitalityPoints = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
/* /*

7
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/base/SubClass.java
View File

@@ -36,6 +36,9 @@ public final class SubClass
private int _vitalityPoints = 0; private int _vitalityPoints = 0;
private boolean _dualClass = false; private boolean _dualClass = false;
public static final int MAX_VITALITY_POINTS = 140000;
public static final int MIN_VITALITY_POINTS = 0;
public SubClass() public SubClass()
{ {
// Used for specifying ALL attributes of a sub class directly, // Used for specifying ALL attributes of a sub class directly,
@@ -69,12 +72,12 @@ public final class SubClass
public int getVitalityPoints() public int getVitalityPoints()
{ {
return _vitalityPoints; return Math.min(Math.max(_vitalityPoints, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
public void setVitalityPoints(int value) public void setVitalityPoints(int value)
{ {
_vitalityPoints = value; _vitalityPoints = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
/** /**

8
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
View File

@@ -462,12 +462,12 @@ public class PcStat extends PlayableStat
{ {
return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints()); return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints());
} }
return Math.min(MAX_VITALITY_POINTS, _vitalityPoints); return Math.min(Math.max(_vitalityPoints, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
public int getBaseVitalityPoints() public int getBaseVitalityPoints()
{ {
return Math.min(MAX_VITALITY_POINTS, _vitalityPoints); return Math.min(Math.max(_vitalityPoints, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
public double getVitalityExpBonus() public double getVitalityExpBonus()
@@ -479,10 +479,10 @@ public class PcStat extends PlayableStat
{ {
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(Math.min(MAX_VITALITY_POINTS, value)); getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(value);
return; return;
} }
_vitalityPoints = Math.min(MAX_VITALITY_POINTS, value); _vitalityPoints = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
/* /*

7
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/base/SubClass.java
View File

@@ -36,6 +36,9 @@ public final class SubClass
private int _vitalityPoints = 0; private int _vitalityPoints = 0;
private boolean _dualClass = false; private boolean _dualClass = false;
public static final int MAX_VITALITY_POINTS = 140000;
public static final int MIN_VITALITY_POINTS = 0;
public SubClass() public SubClass()
{ {
// Used for specifying ALL attributes of a sub class directly, // Used for specifying ALL attributes of a sub class directly,
@@ -69,12 +72,12 @@ public final class SubClass
public int getVitalityPoints() public int getVitalityPoints()
{ {
return _vitalityPoints; return Math.min(Math.max(_vitalityPoints, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
public void setVitalityPoints(int value) public void setVitalityPoints(int value)
{ {
_vitalityPoints = value; _vitalityPoints = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
/** /**

8
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
View File

@@ -457,12 +457,12 @@ public class PcStat extends PlayableStat
{ {
return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints()); return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints());
} }
return Math.min(MAX_VITALITY_POINTS, _vitalityPoints); return Math.min(Math.max(_vitalityPoints, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
public int getBaseVitalityPoints() public int getBaseVitalityPoints()
{ {
return Math.min(MAX_VITALITY_POINTS, _vitalityPoints); return Math.min(Math.max(_vitalityPoints, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
public double getVitalityExpBonus() public double getVitalityExpBonus()
@@ -474,10 +474,10 @@ public class PcStat extends PlayableStat
{ {
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(Math.min(MAX_VITALITY_POINTS, value)); getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(value);
return; return;
} }
_vitalityPoints = Math.min(MAX_VITALITY_POINTS, value); _vitalityPoints = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
/* /*

7
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/base/SubClass.java
View File

@@ -36,6 +36,9 @@ public final class SubClass
private int _vitalityPoints = 0; private int _vitalityPoints = 0;
private boolean _dualClass = false; private boolean _dualClass = false;
public static final int MAX_VITALITY_POINTS = 140000;
public static final int MIN_VITALITY_POINTS = 0;
public SubClass() public SubClass()
{ {
// Used for specifying ALL attributes of a sub class directly, // Used for specifying ALL attributes of a sub class directly,
@@ -69,12 +72,12 @@ public final class SubClass
public int getVitalityPoints() public int getVitalityPoints()
{ {
return _vitalityPoints; return Math.min(Math.max(_vitalityPoints, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
public void setVitalityPoints(int value) public void setVitalityPoints(int value)
{ {
_vitalityPoints = value; _vitalityPoints = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
/** /**

8
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
View File

@@ -462,12 +462,12 @@ public class PcStat extends PlayableStat
{ {
return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints()); return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints());
} }
return Math.min(MAX_VITALITY_POINTS, _vitalityPoints); return Math.min(Math.max(_vitalityPoints, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
public int getBaseVitalityPoints() public int getBaseVitalityPoints()
{ {
return Math.min(MAX_VITALITY_POINTS, _vitalityPoints); return Math.min(Math.max(_vitalityPoints, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
public double getVitalityExpBonus() public double getVitalityExpBonus()
@@ -479,10 +479,10 @@ public class PcStat extends PlayableStat
{ {
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(Math.min(MAX_VITALITY_POINTS, value)); getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(value);
return; return;
} }
_vitalityPoints = Math.min(MAX_VITALITY_POINTS, value); _vitalityPoints = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
/* /*

7
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/base/SubClass.java
View File

@@ -36,6 +36,9 @@ public final class SubClass
private int _vitalityPoints = 0; private int _vitalityPoints = 0;
private boolean _dualClass = false; private boolean _dualClass = false;
public static final int MAX_VITALITY_POINTS = 140000;
public static final int MIN_VITALITY_POINTS = 0;
public SubClass() public SubClass()
{ {
// Used for specifying ALL attributes of a sub class directly, // Used for specifying ALL attributes of a sub class directly,
@@ -69,12 +72,12 @@ public final class SubClass
public int getVitalityPoints() public int getVitalityPoints()
{ {
return _vitalityPoints; return Math.min(Math.max(_vitalityPoints, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
public void setVitalityPoints(int value) public void setVitalityPoints(int value)
{ {
_vitalityPoints = value; _vitalityPoints = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
} }
/** /**