diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
index 23efd7a304..5e101c2434 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
@@ -53,9 +53,9 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 			}
 			case TARGET:
 			{
-				if ((target != null) && !target.isPlayer())
+				if ((target != null) && target.isPlayer())
 				{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId == target.getActingPlayer().getClassId());
+					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
 				}
 				break;
 			}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
index 23efd7a304..5e101c2434 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
@@ -53,9 +53,9 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 			}
 			case TARGET:
 			{
-				if ((target != null) && !target.isPlayer())
+				if ((target != null) && target.isPlayer())
 				{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId == target.getActingPlayer().getClassId());
+					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
 				}
 				break;
 			}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
index 23efd7a304..5e101c2434 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
@@ -53,9 +53,9 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 			}
 			case TARGET:
 			{
-				if ((target != null) && !target.isPlayer())
+				if ((target != null) && target.isPlayer())
 				{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId == target.getActingPlayer().getClassId());
+					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
 				}
 				break;
 			}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
index 23efd7a304..5e101c2434 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
@@ -53,9 +53,9 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 			}
 			case TARGET:
 			{
-				if ((target != null) && !target.isPlayer())
+				if ((target != null) && target.isPlayer())
 				{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId == target.getActingPlayer().getClassId());
+					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
index 23efd7a304..5e101c2434 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
@@ -53,9 +53,9 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 			}
 			case TARGET:
 			{
-				if ((target != null) && !target.isPlayer())
+				if ((target != null) && target.isPlayer())
 				{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId == target.getActingPlayer().getClassId());
+					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
index 23efd7a304..5e101c2434 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
@@ -53,9 +53,9 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 			}
 			case TARGET:
 			{
-				if ((target != null) && !target.isPlayer())
+				if ((target != null) && target.isPlayer())
 				{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId == target.getActingPlayer().getClassId());
+					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
index 23efd7a304..5e101c2434 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java
@@ -53,9 +53,9 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 			}
 			case TARGET:
 			{
-				if ((target != null) && !target.isPlayer())
+				if ((target != null) && target.isPlayer())
 				{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId == target.getActingPlayer().getClassId());
+					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
 				}
 				break;
 			}