diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
index c908c4434d..655809e1c0 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
@@ -57,12 +57,12 @@ public final class PaperdollCache
 		_maxSetEnchant = -1;
 	}
 	
-	public double getBaseStatValue(PlayerInstance player, final BaseStat stat)
+	public double getBaseStatValue(PlayerInstance player, BaseStat stat)
 	{
 		final Double baseStatValue = _baseStatValues.get(stat);
 		if (baseStatValue != null)
 		{
-			return baseStatValue;
+			return baseStatValue.doubleValue();
 		}
 		
 		final Set<ArmorSet> appliedSets = new HashSet<>(2);
@@ -112,7 +112,7 @@ public final class PaperdollCache
 		final Double statValue = _statValues.get(stat);
 		if (statValue != null)
 		{
-			return statValue;
+			return statValue.doubleValue();
 		}
 		
 		double value = 0;
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
index c908c4434d..655809e1c0 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
@@ -57,12 +57,12 @@ public final class PaperdollCache
 		_maxSetEnchant = -1;
 	}
 	
-	public double getBaseStatValue(PlayerInstance player, final BaseStat stat)
+	public double getBaseStatValue(PlayerInstance player, BaseStat stat)
 	{
 		final Double baseStatValue = _baseStatValues.get(stat);
 		if (baseStatValue != null)
 		{
-			return baseStatValue;
+			return baseStatValue.doubleValue();
 		}
 		
 		final Set<ArmorSet> appliedSets = new HashSet<>(2);
@@ -112,7 +112,7 @@ public final class PaperdollCache
 		final Double statValue = _statValues.get(stat);
 		if (statValue != null)
 		{
-			return statValue;
+			return statValue.doubleValue();
 		}
 		
 		double value = 0;
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
index c908c4434d..655809e1c0 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
@@ -57,12 +57,12 @@ public final class PaperdollCache
 		_maxSetEnchant = -1;
 	}
 	
-	public double getBaseStatValue(PlayerInstance player, final BaseStat stat)
+	public double getBaseStatValue(PlayerInstance player, BaseStat stat)
 	{
 		final Double baseStatValue = _baseStatValues.get(stat);
 		if (baseStatValue != null)
 		{
-			return baseStatValue;
+			return baseStatValue.doubleValue();
 		}
 		
 		final Set<ArmorSet> appliedSets = new HashSet<>(2);
@@ -112,7 +112,7 @@ public final class PaperdollCache
 		final Double statValue = _statValues.get(stat);
 		if (statValue != null)
 		{
-			return statValue;
+			return statValue.doubleValue();
 		}
 		
 		double value = 0;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
index c908c4434d..655809e1c0 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
@@ -57,12 +57,12 @@ public final class PaperdollCache
 		_maxSetEnchant = -1;
 	}
 	
-	public double getBaseStatValue(PlayerInstance player, final BaseStat stat)
+	public double getBaseStatValue(PlayerInstance player, BaseStat stat)
 	{
 		final Double baseStatValue = _baseStatValues.get(stat);
 		if (baseStatValue != null)
 		{
-			return baseStatValue;
+			return baseStatValue.doubleValue();
 		}
 		
 		final Set<ArmorSet> appliedSets = new HashSet<>(2);
@@ -112,7 +112,7 @@ public final class PaperdollCache
 		final Double statValue = _statValues.get(stat);
 		if (statValue != null)
 		{
-			return statValue;
+			return statValue.doubleValue();
 		}
 		
 		double value = 0;
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
index c908c4434d..655809e1c0 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
@@ -57,12 +57,12 @@ public final class PaperdollCache
 		_maxSetEnchant = -1;
 	}
 	
-	public double getBaseStatValue(PlayerInstance player, final BaseStat stat)
+	public double getBaseStatValue(PlayerInstance player, BaseStat stat)
 	{
 		final Double baseStatValue = _baseStatValues.get(stat);
 		if (baseStatValue != null)
 		{
-			return baseStatValue;
+			return baseStatValue.doubleValue();
 		}
 		
 		final Set<ArmorSet> appliedSets = new HashSet<>(2);
@@ -112,7 +112,7 @@ public final class PaperdollCache
 		final Double statValue = _statValues.get(stat);
 		if (statValue != null)
 		{
-			return statValue;
+			return statValue.doubleValue();
 		}
 		
 		double value = 0;
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
index c908c4434d..655809e1c0 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
@@ -57,12 +57,12 @@ public final class PaperdollCache
 		_maxSetEnchant = -1;
 	}
 	
-	public double getBaseStatValue(PlayerInstance player, final BaseStat stat)
+	public double getBaseStatValue(PlayerInstance player, BaseStat stat)
 	{
 		final Double baseStatValue = _baseStatValues.get(stat);
 		if (baseStatValue != null)
 		{
-			return baseStatValue;
+			return baseStatValue.doubleValue();
 		}
 		
 		final Set<ArmorSet> appliedSets = new HashSet<>(2);
@@ -112,7 +112,7 @@ public final class PaperdollCache
 		final Double statValue = _statValues.get(stat);
 		if (statValue != null)
 		{
-			return statValue;
+			return statValue.doubleValue();
 		}
 		
 		double value = 0;
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
index c908c4434d..655809e1c0 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
@@ -57,12 +57,12 @@ public final class PaperdollCache
 		_maxSetEnchant = -1;
 	}
 	
-	public double getBaseStatValue(PlayerInstance player, final BaseStat stat)
+	public double getBaseStatValue(PlayerInstance player, BaseStat stat)
 	{
 		final Double baseStatValue = _baseStatValues.get(stat);
 		if (baseStatValue != null)
 		{
-			return baseStatValue;
+			return baseStatValue.doubleValue();
 		}
 		
 		final Set<ArmorSet> appliedSets = new HashSet<>(2);
@@ -112,7 +112,7 @@ public final class PaperdollCache
 		final Double statValue = _statValues.get(stat);
 		if (statValue != null)
 		{
-			return statValue;
+			return statValue.doubleValue();
 		}
 		
 		double value = 0;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
index c908c4434d..655809e1c0 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
@@ -57,12 +57,12 @@ public final class PaperdollCache
 		_maxSetEnchant = -1;
 	}
 	
-	public double getBaseStatValue(PlayerInstance player, final BaseStat stat)
+	public double getBaseStatValue(PlayerInstance player, BaseStat stat)
 	{
 		final Double baseStatValue = _baseStatValues.get(stat);
 		if (baseStatValue != null)
 		{
-			return baseStatValue;
+			return baseStatValue.doubleValue();
 		}
 		
 		final Set<ArmorSet> appliedSets = new HashSet<>(2);
@@ -112,7 +112,7 @@ public final class PaperdollCache
 		final Double statValue = _statValues.get(stat);
 		if (statValue != null)
 		{
-			return statValue;
+			return statValue.doubleValue();
 		}
 		
 		double value = 0;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
index c908c4434d..655809e1c0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
@@ -57,12 +57,12 @@ public final class PaperdollCache
 		_maxSetEnchant = -1;
 	}
 	
-	public double getBaseStatValue(PlayerInstance player, final BaseStat stat)
+	public double getBaseStatValue(PlayerInstance player, BaseStat stat)
 	{
 		final Double baseStatValue = _baseStatValues.get(stat);
 		if (baseStatValue != null)
 		{
-			return baseStatValue;
+			return baseStatValue.doubleValue();
 		}
 		
 		final Set<ArmorSet> appliedSets = new HashSet<>(2);
@@ -112,7 +112,7 @@ public final class PaperdollCache
 		final Double statValue = _statValues.get(stat);
 		if (statValue != null)
 		{
-			return statValue;
+			return statValue.doubleValue();
 		}
 		
 		double value = 0;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
index c908c4434d..655809e1c0 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
@@ -57,12 +57,12 @@ public final class PaperdollCache
 		_maxSetEnchant = -1;
 	}
 	
-	public double getBaseStatValue(PlayerInstance player, final BaseStat stat)
+	public double getBaseStatValue(PlayerInstance player, BaseStat stat)
 	{
 		final Double baseStatValue = _baseStatValues.get(stat);
 		if (baseStatValue != null)
 		{
-			return baseStatValue;
+			return baseStatValue.doubleValue();
 		}
 		
 		final Set<ArmorSet> appliedSets = new HashSet<>(2);
@@ -112,7 +112,7 @@ public final class PaperdollCache
 		final Double statValue = _statValues.get(stat);
 		if (statValue != null)
 		{
-			return statValue;
+			return statValue.doubleValue();
 		}
 		
 		double value = 0;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
index c908c4434d..655809e1c0 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
@@ -57,12 +57,12 @@ public final class PaperdollCache
 		_maxSetEnchant = -1;
 	}
 	
-	public double getBaseStatValue(PlayerInstance player, final BaseStat stat)
+	public double getBaseStatValue(PlayerInstance player, BaseStat stat)
 	{
 		final Double baseStatValue = _baseStatValues.get(stat);
 		if (baseStatValue != null)
 		{
-			return baseStatValue;
+			return baseStatValue.doubleValue();
 		}
 		
 		final Set<ArmorSet> appliedSets = new HashSet<>(2);
@@ -112,7 +112,7 @@ public final class PaperdollCache
 		final Double statValue = _statValues.get(stat);
 		if (statValue != null)
 		{
-			return statValue;
+			return statValue.doubleValue();
 		}
 		
 		double value = 0;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
index c908c4434d..655809e1c0 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
@@ -57,12 +57,12 @@ public final class PaperdollCache
 		_maxSetEnchant = -1;
 	}
 	
-	public double getBaseStatValue(PlayerInstance player, final BaseStat stat)
+	public double getBaseStatValue(PlayerInstance player, BaseStat stat)
 	{
 		final Double baseStatValue = _baseStatValues.get(stat);
 		if (baseStatValue != null)
 		{
-			return baseStatValue;
+			return baseStatValue.doubleValue();
 		}
 		
 		final Set<ArmorSet> appliedSets = new HashSet<>(2);
@@ -112,7 +112,7 @@ public final class PaperdollCache
 		final Double statValue = _statValues.get(stat);
 		if (statValue != null)
 		{
-			return statValue;
+			return statValue.doubleValue();
 		}
 		
 		double value = 0;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
index c908c4434d..655809e1c0 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
@@ -57,12 +57,12 @@ public final class PaperdollCache
 		_maxSetEnchant = -1;
 	}
 	
-	public double getBaseStatValue(PlayerInstance player, final BaseStat stat)
+	public double getBaseStatValue(PlayerInstance player, BaseStat stat)
 	{
 		final Double baseStatValue = _baseStatValues.get(stat);
 		if (baseStatValue != null)
 		{
-			return baseStatValue;
+			return baseStatValue.doubleValue();
 		}
 		
 		final Set<ArmorSet> appliedSets = new HashSet<>(2);
@@ -112,7 +112,7 @@ public final class PaperdollCache
 		final Double statValue = _statValues.get(stat);
 		if (statValue != null)
 		{
-			return statValue;
+			return statValue.doubleValue();
 		}
 		
 		double value = 0;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
index c908c4434d..655809e1c0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
@@ -57,12 +57,12 @@ public final class PaperdollCache
 		_maxSetEnchant = -1;
 	}
 	
-	public double getBaseStatValue(PlayerInstance player, final BaseStat stat)
+	public double getBaseStatValue(PlayerInstance player, BaseStat stat)
 	{
 		final Double baseStatValue = _baseStatValues.get(stat);
 		if (baseStatValue != null)
 		{
-			return baseStatValue;
+			return baseStatValue.doubleValue();
 		}
 		
 		final Set<ArmorSet> appliedSets = new HashSet<>(2);
@@ -112,7 +112,7 @@ public final class PaperdollCache
 		final Double statValue = _statValues.get(stat);
 		if (statValue != null)
 		{
-			return statValue;
+			return statValue.doubleValue();
 		}
 		
 		double value = 0;
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
index c908c4434d..655809e1c0 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/cache/PaperdollCache.java
@@ -57,12 +57,12 @@ public final class PaperdollCache
 		_maxSetEnchant = -1;
 	}
 	
-	public double getBaseStatValue(PlayerInstance player, final BaseStat stat)
+	public double getBaseStatValue(PlayerInstance player, BaseStat stat)
 	{
 		final Double baseStatValue = _baseStatValues.get(stat);
 		if (baseStatValue != null)
 		{
-			return baseStatValue;
+			return baseStatValue.doubleValue();
 		}
 		
 		final Set<ArmorSet> appliedSets = new HashSet<>(2);
@@ -112,7 +112,7 @@ public final class PaperdollCache
 		final Double statValue = _statValues.get(stat);
 		if (statValue != null)
 		{
-			return statValue;
+			return statValue.doubleValue();
 		}
 		
 		double value = 0;