Removed stream usage from OpCheckClassListSkillCondition.

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }

L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/skillconditionhandlers/OpCheckClassListSkillCondition.java

@@ -16,7 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.SkillConditionAffectType;
@@ -27,17 +29,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class OpCheckClassListSkillCondition implements ISkillCondition
 {
-	private final List<ClassId> _classIds;
+	private final Set<ClassId> _classIds = EnumSet.noneOf(ClassId.class);
 	private final SkillConditionAffectType _affectType;
 	private final boolean _isWithin;
 	
 	public OpCheckClassListSkillCondition(StatSet params)
 	{
-		_classIds = params.getEnumList("classIds", ClassId.class);
+		final List<ClassId> classIds = params.getEnumList("classIds", ClassId.class);
+		if (classIds != null)
+		{
+			_classIds.addAll(classIds);
+		}
 		_affectType = params.getEnum("affectType", SkillConditionAffectType.class);
 		_isWithin = params.getBoolean("isWithin");
 	}
@@ -49,17 +55,16 @@ public class OpCheckClassListSkillCondition implements ISkillCondition
 		{
 			case CASTER:
 			{
-				return caster.isPlayer() && (_isWithin == _classIds.stream().anyMatch(classId -> classId == caster.getActingPlayer().getClassId()));
+				return caster.isPlayer() && (_classIds.contains(caster.getActingPlayer().getClassId()) == _isWithin);
 			}
 			case TARGET:
 			{
-				if ((target != null) && target.isPlayer())
+				return (target != null) && target.isPlayer() && (_classIds.contains(target.getActingPlayer().getClassId()) == _isWithin);
+			}
+			default:
 			{
-					return _isWithin == _classIds.stream().anyMatch(classId -> classId.getId() == target.getActingPlayer().getClassId().getId());
-				}
-				break;
-			}
-		}
 				return false;
 			}
+		}
+	}
 }