Removed stream usage from Op2hWeaponSkillCondition.

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }

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

@@ -16,8 +16,9 @@
  */
 package handlers.skillconditionhandlers;
 
-import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
 
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -29,18 +30,21 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class Op2hWeaponSkillCondition implements ISkillCondition
 {
-	private final List<WeaponType> _weaponTypes = new ArrayList<>();
+	private final Set<WeaponType> _weaponTypes = EnumSet.noneOf(WeaponType.class);
 	
 	public Op2hWeaponSkillCondition(StatSet params)
 	{
 		final List<String> weaponTypes = params.getList("weaponType", String.class);
 		if (weaponTypes != null)
 		{
-			weaponTypes.stream().map(WeaponType::valueOf).forEach(_weaponTypes::add);
+			for (String type : weaponTypes)
+			{
+				_weaponTypes.add(WeaponType.valueOf(type));
+			}
 		}
 	}
 	
@@ -52,6 +56,15 @@ public class Op2hWeaponSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		return _weaponTypes.stream().anyMatch(weaponType -> (weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0));
+		
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if ((weapon.getItemType() == weaponType) && ((weapon.getBodyPart() & ItemTemplate.SLOT_LR_HAND) != 0))
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }