diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
index 06530a50ed..5003b7ae7b 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
@@ -65,7 +65,7 @@ public interface IStatFunction
 	default double calcWeaponBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		if (creature.isPet())
 		{
 			final PetInstance pet = (PetInstance) creature;
@@ -85,7 +85,7 @@ public interface IStatFunction
 	default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		
 		if (creature.isPlayable())
 		{
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
index 06530a50ed..5003b7ae7b 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
@@ -65,7 +65,7 @@ public interface IStatFunction
 	default double calcWeaponBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		if (creature.isPet())
 		{
 			final PetInstance pet = (PetInstance) creature;
@@ -85,7 +85,7 @@ public interface IStatFunction
 	default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		
 		if (creature.isPlayable())
 		{
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
index 06530a50ed..5003b7ae7b 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
@@ -65,7 +65,7 @@ public interface IStatFunction
 	default double calcWeaponBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		if (creature.isPet())
 		{
 			final PetInstance pet = (PetInstance) creature;
@@ -85,7 +85,7 @@ public interface IStatFunction
 	default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		
 		if (creature.isPlayable())
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
index 06530a50ed..5003b7ae7b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
@@ -65,7 +65,7 @@ public interface IStatFunction
 	default double calcWeaponBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		if (creature.isPet())
 		{
 			final PetInstance pet = (PetInstance) creature;
@@ -85,7 +85,7 @@ public interface IStatFunction
 	default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		
 		if (creature.isPlayable())
 		{
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
index a0f37907cb..de110a62cf 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
@@ -65,7 +65,7 @@ public interface IStatFunction
 	default double calcWeaponBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		if (creature.isPet())
 		{
 			final PetInstance pet = (PetInstance) creature;
@@ -85,7 +85,7 @@ public interface IStatFunction
 	default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		
 		if (creature.isPlayable())
 		{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
index a0f37907cb..de110a62cf 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
@@ -65,7 +65,7 @@ public interface IStatFunction
 	default double calcWeaponBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		if (creature.isPet())
 		{
 			final PetInstance pet = (PetInstance) creature;
@@ -85,7 +85,7 @@ public interface IStatFunction
 	default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		
 		if (creature.isPlayable())
 		{
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
index a0f37907cb..de110a62cf 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
@@ -65,7 +65,7 @@ public interface IStatFunction
 	default double calcWeaponBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		if (creature.isPet())
 		{
 			final PetInstance pet = (PetInstance) creature;
@@ -85,7 +85,7 @@ public interface IStatFunction
 	default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		
 		if (creature.isPlayable())
 		{
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
index a0f37907cb..de110a62cf 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
@@ -65,7 +65,7 @@ public interface IStatFunction
 	default double calcWeaponBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		if (creature.isPet())
 		{
 			final PetInstance pet = (PetInstance) creature;
@@ -85,7 +85,7 @@ public interface IStatFunction
 	default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		
 		if (creature.isPlayable())
 		{
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
index a0f37907cb..de110a62cf 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
@@ -65,7 +65,7 @@ public interface IStatFunction
 	default double calcWeaponBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		if (creature.isPet())
 		{
 			final PetInstance pet = (PetInstance) creature;
@@ -85,7 +85,7 @@ public interface IStatFunction
 	default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		
 		if (creature.isPlayable())
 		{
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
index a0f37907cb..de110a62cf 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
@@ -65,7 +65,7 @@ public interface IStatFunction
 	default double calcWeaponBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		if (creature.isPet())
 		{
 			final PetInstance pet = (PetInstance) creature;
@@ -85,7 +85,7 @@ public interface IStatFunction
 	default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		
 		if (creature.isPlayable())
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
index 06530a50ed..5003b7ae7b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
@@ -65,7 +65,7 @@ public interface IStatFunction
 	default double calcWeaponBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		if (creature.isPet())
 		{
 			final PetInstance pet = (PetInstance) creature;
@@ -85,7 +85,7 @@ public interface IStatFunction
 	default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		
 		if (creature.isPlayable())
 		{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
index 06530a50ed..5003b7ae7b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
@@ -65,7 +65,7 @@ public interface IStatFunction
 	default double calcWeaponBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		if (creature.isPet())
 		{
 			final PetInstance pet = (PetInstance) creature;
@@ -85,7 +85,7 @@ public interface IStatFunction
 	default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		
 		if (creature.isPlayable())
 		{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
index a0f37907cb..de110a62cf 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
@@ -65,7 +65,7 @@ public interface IStatFunction
 	default double calcWeaponBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		if (creature.isPet())
 		{
 			final PetInstance pet = (PetInstance) creature;
@@ -85,7 +85,7 @@ public interface IStatFunction
 	default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		
 		if (creature.isPlayable())
 		{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
index a0f37907cb..de110a62cf 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
@@ -65,7 +65,7 @@ public interface IStatFunction
 	default double calcWeaponBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		if (creature.isPet())
 		{
 			final PetInstance pet = (PetInstance) creature;
@@ -85,7 +85,7 @@ public interface IStatFunction
 	default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		
 		if (creature.isPlayable())
 		{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
index a0f37907cb..de110a62cf 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
@@ -65,7 +65,7 @@ public interface IStatFunction
 	default double calcWeaponBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		if (creature.isPet())
 		{
 			final PetInstance pet = (PetInstance) creature;
@@ -85,7 +85,7 @@ public interface IStatFunction
 	default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		
 		if (creature.isPlayable())
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
index a0f37907cb..de110a62cf 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
@@ -65,7 +65,7 @@ public interface IStatFunction
 	default double calcWeaponBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		if (creature.isPet())
 		{
 			final PetInstance pet = (PetInstance) creature;
@@ -85,7 +85,7 @@ public interface IStatFunction
 	default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		
 		if (creature.isPlayable())
 		{
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
index 06530a50ed..5003b7ae7b 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
@@ -65,7 +65,7 @@ public interface IStatFunction
 	default double calcWeaponBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		if (creature.isPet())
 		{
 			final PetInstance pet = (PetInstance) creature;
@@ -85,7 +85,7 @@ public interface IStatFunction
 	default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		
 		if (creature.isPlayable())
 		{
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
index 9eaee4499e..531fe7bb0a 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
@@ -65,7 +65,7 @@ public interface IStatFunction
 	default double calcWeaponBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		if (creature.isPet())
 		{
 			final PetInstance pet = (PetInstance) creature;
@@ -85,7 +85,7 @@ public interface IStatFunction
 	default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		
 		if (creature.isPlayable())
 		{
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
index 9eaee4499e..531fe7bb0a 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
@@ -65,7 +65,7 @@ public interface IStatFunction
 	default double calcWeaponBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		if (creature.isPet())
 		{
 			final PetInstance pet = (PetInstance) creature;
@@ -85,7 +85,7 @@ public interface IStatFunction
 	default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
 	{
 		final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
-		double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
+		double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
 		
 		if (creature.isPlayable())
 		{