Sync with L2jServer HighFive Mar 1st 2015.

2015-03-01 22:48:14 +00:00
parent f14af24b41
commit 6fa0ed56e3
116 changed files with 971 additions and 676 deletions
--- a/trunk/java/com/l2jserver/gameserver/model/items/L2Weapon.java
+++ b/trunk/java/com/l2jserver/gameserver/model/items/L2Weapon.java
@ -399,6 +399,16 @@ public final class L2Weapon extends L2Item
 			return;
 		}
 		
+		if (trigger.isToggle())
+		{
+			return;
+		}
+		
+		if (caster.getAI().getCastTarget() != target)
+		{
+			return;
+		}
+		
 		if (_skillsOnMagicCondition != null)
 		{
 			if (!_skillsOnMagicCondition.test(caster, target, onMagicSkill))