Removed stream usage from CategoryTypeCondition.

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }

L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/conditions/CategoryTypeCondition.java

@@ -16,7 +16,8 @@
  */
 package handlers.conditions;
 
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.StatSet;
@@ -25,20 +26,27 @@ import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.conditions.ICondition;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class CategoryTypeCondition implements ICondition
 {
-	private final List<CategoryType> _categoryTypes;
+	private final Set<CategoryType> _categoryTypes = EnumSet.noneOf(CategoryType.class);
 	
 	public CategoryTypeCondition(StatSet params)
 	{
-		_categoryTypes = params.getEnumList("category", CategoryType.class);
+		_categoryTypes.addAll(params.getEnumList("category", CategoryType.class));
 	}
 	
 	@Override
 	public boolean test(Creature creature, WorldObject target)
 	{
-		return _categoryTypes.stream().anyMatch(creature::isInCategory);
+		for (CategoryType type : _categoryTypes)
+		{
+			if (creature.isInCategory(type))
+			{
+				return true;
+			}
+		}
+		return false;
 	}
 }