diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
index a135a75709..b0a11886d4 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -20,6 +20,7 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.item.ItemTemplate;
 import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.stats.BaseStat;
 
 /**
  * The Class ConditionPlayerBaseStats.
@@ -50,48 +51,40 @@ public class ConditionPlayerBaseStats extends Condition
 	@Override
 	public boolean testImpl(Creature effector, Creature effected, Skill skill, ItemTemplate item)
 	{
-		if (effector.getActingPlayer() == null)
+		final Player player = effector.getActingPlayer();
+		if (player == null)
 		{
 			return false;
 		}
-		final Player player = effector.getActingPlayer();
+		
 		switch (_stat)
 		{
-			case Int:
+			case INT:
 			{
 				return player.getINT() >= _value;
 			}
-			case Str:
+			case STR:
 			{
 				return player.getSTR() >= _value;
 			}
-			case Con:
+			case CON:
 			{
 				return player.getCON() >= _value;
 			}
-			case Dex:
+			case DEX:
 			{
 				return player.getDEX() >= _value;
 			}
-			case Men:
+			case MEN:
 			{
 				return player.getMEN() >= _value;
 			}
-			case Wit:
+			case WIT:
 			{
 				return player.getWIT() >= _value;
 			}
 		}
+		
 		return false;
 	}
 }
-
-enum BaseStat
-{
-	Int,
-	Str,
-	Con,
-	Dex,
-	Men,
-	Wit
-}