diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
index 922f80b93b..e6976d676e 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
@@ -458,14 +458,14 @@ public class PcStat extends PlayableStat
 	{
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints();
+			return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints());
 		}
-		return _vitalityPoints;
+		return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
 	}
 	
 	public int getBaseVitalityPoints()
 	{
-		return _vitalityPoints;
+		return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
 	}
 	
 	public double getVitalityExpBonus()
@@ -477,10 +477,10 @@ public class PcStat extends PlayableStat
 	{
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(Math.min(MAX_VITALITY_POINTS, value));
 			return;
 		}
-		_vitalityPoints = value;
+		_vitalityPoints = Math.min(MAX_VITALITY_POINTS, value);
 	}
 	
 	/*
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
index c3b413e1dd..a14e2ba184 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
@@ -460,14 +460,14 @@ public class PcStat extends PlayableStat
 	{
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints();
+			return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints());
 		}
-		return _vitalityPoints;
+		return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
 	}
 	
 	public int getBaseVitalityPoints()
 	{
-		return _vitalityPoints;
+		return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
 	}
 	
 	public double getVitalityExpBonus()
@@ -479,10 +479,10 @@ public class PcStat extends PlayableStat
 	{
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(Math.min(MAX_VITALITY_POINTS, value));
 			return;
 		}
-		_vitalityPoints = value;
+		_vitalityPoints = Math.min(MAX_VITALITY_POINTS, value);
 	}
 	
 	/*
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
index c3b413e1dd..a14e2ba184 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
@@ -460,14 +460,14 @@ public class PcStat extends PlayableStat
 	{
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints();
+			return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints());
 		}
-		return _vitalityPoints;
+		return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
 	}
 	
 	public int getBaseVitalityPoints()
 	{
-		return _vitalityPoints;
+		return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
 	}
 	
 	public double getVitalityExpBonus()
@@ -479,10 +479,10 @@ public class PcStat extends PlayableStat
 	{
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(Math.min(MAX_VITALITY_POINTS, value));
 			return;
 		}
-		_vitalityPoints = value;
+		_vitalityPoints = Math.min(MAX_VITALITY_POINTS, value);
 	}
 	
 	/*
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
index ae9f6ac77a..fa90e21479 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
@@ -455,14 +455,14 @@ public class PcStat extends PlayableStat
 	{
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints();
+			return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints());
 		}
-		return _vitalityPoints;
+		return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
 	}
 	
 	public int getBaseVitalityPoints()
 	{
-		return _vitalityPoints;
+		return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
 	}
 	
 	public double getVitalityExpBonus()
@@ -474,10 +474,10 @@ public class PcStat extends PlayableStat
 	{
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(Math.min(MAX_VITALITY_POINTS, value));
 			return;
 		}
-		_vitalityPoints = value;
+		_vitalityPoints = Math.min(MAX_VITALITY_POINTS, value);
 	}
 	
 	/*
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
index 70ae210865..cf4932acb9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
@@ -460,14 +460,14 @@ public class PcStat extends PlayableStat
 	{
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints();
+			return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints());
 		}
-		return _vitalityPoints;
+		return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
 	}
 	
 	public int getBaseVitalityPoints()
 	{
-		return _vitalityPoints;
+		return Math.min(MAX_VITALITY_POINTS, _vitalityPoints);
 	}
 	
 	public double getVitalityExpBonus()
@@ -479,10 +479,10 @@ public class PcStat extends PlayableStat
 	{
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setVitalityPoints(Math.min(MAX_VITALITY_POINTS, value));
 			return;
 		}
-		_vitalityPoints = value;
+		_vitalityPoints = Math.min(MAX_VITALITY_POINTS, value);
 	}
 	
 	/*