diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
index ece274d40d..ae260af2da 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
@@ -50,8 +50,23 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
+		
 		final Creature targetCreature = (Creature) target;
 		final Weapon weapon = targetCreature.getActiveWeaponItem();
-		return _weaponTypes.stream().anyMatch(weaponType -> weaponType == weapon.getItemType());
+		if (weapon == null)
+		{
+			return false;
+		}
+		
+		final WeaponType equippedType = weapon.getItemType();
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if (weaponType == equippedType)
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
index ece274d40d..ae260af2da 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
@@ -50,8 +50,23 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
+		
 		final Creature targetCreature = (Creature) target;
 		final Weapon weapon = targetCreature.getActiveWeaponItem();
-		return _weaponTypes.stream().anyMatch(weaponType -> weaponType == weapon.getItemType());
+		if (weapon == null)
+		{
+			return false;
+		}
+		
+		final WeaponType equippedType = weapon.getItemType();
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if (weaponType == equippedType)
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
index ece274d40d..ae260af2da 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
@@ -50,8 +50,23 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
+		
 		final Creature targetCreature = (Creature) target;
 		final Weapon weapon = targetCreature.getActiveWeaponItem();
-		return _weaponTypes.stream().anyMatch(weaponType -> weaponType == weapon.getItemType());
+		if (weapon == null)
+		{
+			return false;
+		}
+		
+		final WeaponType equippedType = weapon.getItemType();
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if (weaponType == equippedType)
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
index ece274d40d..ae260af2da 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
@@ -50,8 +50,23 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
+		
 		final Creature targetCreature = (Creature) target;
 		final Weapon weapon = targetCreature.getActiveWeaponItem();
-		return _weaponTypes.stream().anyMatch(weaponType -> weaponType == weapon.getItemType());
+		if (weapon == null)
+		{
+			return false;
+		}
+		
+		final WeaponType equippedType = weapon.getItemType();
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if (weaponType == equippedType)
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
index ece274d40d..ae260af2da 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
@@ -50,8 +50,23 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
+		
 		final Creature targetCreature = (Creature) target;
 		final Weapon weapon = targetCreature.getActiveWeaponItem();
-		return _weaponTypes.stream().anyMatch(weaponType -> weaponType == weapon.getItemType());
+		if (weapon == null)
+		{
+			return false;
+		}
+		
+		final WeaponType equippedType = weapon.getItemType();
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if (weaponType == equippedType)
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
index ece274d40d..ae260af2da 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
@@ -50,8 +50,23 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
+		
 		final Creature targetCreature = (Creature) target;
 		final Weapon weapon = targetCreature.getActiveWeaponItem();
-		return _weaponTypes.stream().anyMatch(weaponType -> weaponType == weapon.getItemType());
+		if (weapon == null)
+		{
+			return false;
+		}
+		
+		final WeaponType equippedType = weapon.getItemType();
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if (weaponType == equippedType)
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
index ece274d40d..ae260af2da 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
@@ -50,8 +50,23 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
+		
 		final Creature targetCreature = (Creature) target;
 		final Weapon weapon = targetCreature.getActiveWeaponItem();
-		return _weaponTypes.stream().anyMatch(weaponType -> weaponType == weapon.getItemType());
+		if (weapon == null)
+		{
+			return false;
+		}
+		
+		final WeaponType equippedType = weapon.getItemType();
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if (weaponType == equippedType)
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
index ece274d40d..ae260af2da 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
@@ -50,8 +50,23 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
+		
 		final Creature targetCreature = (Creature) target;
 		final Weapon weapon = targetCreature.getActiveWeaponItem();
-		return _weaponTypes.stream().anyMatch(weaponType -> weaponType == weapon.getItemType());
+		if (weapon == null)
+		{
+			return false;
+		}
+		
+		final WeaponType equippedType = weapon.getItemType();
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if (weaponType == equippedType)
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
index ece274d40d..ae260af2da 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
@@ -50,8 +50,23 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
+		
 		final Creature targetCreature = (Creature) target;
 		final Weapon weapon = targetCreature.getActiveWeaponItem();
-		return _weaponTypes.stream().anyMatch(weaponType -> weaponType == weapon.getItemType());
+		if (weapon == null)
+		{
+			return false;
+		}
+		
+		final WeaponType equippedType = weapon.getItemType();
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if (weaponType == equippedType)
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
index ece274d40d..ae260af2da 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
@@ -50,8 +50,23 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
+		
 		final Creature targetCreature = (Creature) target;
 		final Weapon weapon = targetCreature.getActiveWeaponItem();
-		return _weaponTypes.stream().anyMatch(weaponType -> weaponType == weapon.getItemType());
+		if (weapon == null)
+		{
+			return false;
+		}
+		
+		final WeaponType equippedType = weapon.getItemType();
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if (weaponType == equippedType)
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
index ece274d40d..ae260af2da 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
@@ -50,8 +50,23 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
+		
 		final Creature targetCreature = (Creature) target;
 		final Weapon weapon = targetCreature.getActiveWeaponItem();
-		return _weaponTypes.stream().anyMatch(weaponType -> weaponType == weapon.getItemType());
+		if (weapon == null)
+		{
+			return false;
+		}
+		
+		final WeaponType equippedType = weapon.getItemType();
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if (weaponType == equippedType)
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
index ece274d40d..ae260af2da 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
@@ -50,8 +50,23 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
+		
 		final Creature targetCreature = (Creature) target;
 		final Weapon weapon = targetCreature.getActiveWeaponItem();
-		return _weaponTypes.stream().anyMatch(weaponType -> weaponType == weapon.getItemType());
+		if (weapon == null)
+		{
+			return false;
+		}
+		
+		final WeaponType equippedType = weapon.getItemType();
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if (weaponType == equippedType)
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
index ece274d40d..ae260af2da 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
@@ -50,8 +50,23 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
+		
 		final Creature targetCreature = (Creature) target;
 		final Weapon weapon = targetCreature.getActiveWeaponItem();
-		return _weaponTypes.stream().anyMatch(weaponType -> weaponType == weapon.getItemType());
+		if (weapon == null)
+		{
+			return false;
+		}
+		
+		final WeaponType equippedType = weapon.getItemType();
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if (weaponType == equippedType)
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
index ece274d40d..ae260af2da 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
@@ -50,8 +50,23 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
+		
 		final Creature targetCreature = (Creature) target;
 		final Weapon weapon = targetCreature.getActiveWeaponItem();
-		return _weaponTypes.stream().anyMatch(weaponType -> weaponType == weapon.getItemType());
+		if (weapon == null)
+		{
+			return false;
+		}
+		
+		final WeaponType equippedType = weapon.getItemType();
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if (weaponType == equippedType)
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
index ece274d40d..ae260af2da 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetWeaponAttackTypeSkillCondition.java
@@ -50,8 +50,23 @@ public class OpTargetWeaponAttackTypeSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
+		
 		final Creature targetCreature = (Creature) target;
 		final Weapon weapon = targetCreature.getActiveWeaponItem();
-		return _weaponTypes.stream().anyMatch(weaponType -> weaponType == weapon.getItemType());
+		if (weapon == null)
+		{
+			return false;
+		}
+		
+		final WeaponType equippedType = weapon.getItemType();
+		for (WeaponType weaponType : _weaponTypes)
+		{
+			if (weaponType == equippedType)
+			{
+				return true;
+			}
+		}
+		
+		return false;
 	}
 }