Removed stream usage from SkillCaster.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1064,10 +1064,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1064,10 +1064,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1064,10 +1064,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1064,10 +1064,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1064,10 +1064,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1064,10 +1064,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1064,10 +1064,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1064,10 +1064,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1070,10 +1070,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1102,10 +1102,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1102,10 +1102,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1102,10 +1102,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1064,10 +1064,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1064,10 +1064,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1064,10 +1064,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1064,10 +1064,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1064,10 +1064,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1064,10 +1064,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1064,10 +1064,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1064,10 +1064,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1069,10 +1069,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1064,10 +1064,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1070,10 +1070,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1102,10 +1102,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1135,10 +1135,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}
 		

L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java

@@ -1135,10 +1135,23 @@ public class SkillCaster implements Runnable
 		if ((weapon != null) && weapon.useWeaponSkillsOnly() && !caster.canOverrideCond(PlayerCondOverride.SKILL_CONDITIONS))
 		{
 			final List<ItemSkillHolder> weaponSkills = weapon.getSkills(ItemSkillType.NORMAL);
-			if ((weaponSkills != null) && weaponSkills.stream().noneMatch(sh -> sh.getSkillId() == skill.getId()))
+			if (weaponSkills != null)
 			{
-				caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+				boolean hasSkill = false;
-				return false;
+				for (ItemSkillHolder holder : weaponSkills)
+				{
+					if (holder.getSkillId() == skill.getId())
+					{
+						hasSkill = true;
+						break;
+					}
+				}
+				
+				if (!hasSkill)
+				{
+					caster.sendPacket(SystemMessageId.THAT_WEAPON_CANNOT_USE_ANY_OTHER_SKILL_EXCEPT_THE_WEAPON_S_SKILL);
+					return false;
+				}
 			}
 		}