TriggerSkillByMagicType should not be triggered by common skills.

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
@@ -90,7 +91,8 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
-		if (!CommonUtil.contains(_magicTypes, event.getSkill().getMagicType()))
+		final Skill eventSkill = event.getSkill();
+		if (!CommonUtil.contains(_magicTypes, eventSkill.getMagicType()))
 		{
 			return;
 		}
@@ -114,6 +116,15 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
+		// Ignore common skills.
+		for (CommonSkill skill : CommonSkill.values())
+		{
+			if (skill.getId() == eventSkill.getId())
+			{
+				return;
+			}
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{

L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
@@ -90,7 +91,8 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
-		if (!CommonUtil.contains(_magicTypes, event.getSkill().getMagicType()))
+		final Skill eventSkill = event.getSkill();
+		if (!CommonUtil.contains(_magicTypes, eventSkill.getMagicType()))
 		{
 			return;
 		}
@@ -114,6 +116,15 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
+		// Ignore common skills.
+		for (CommonSkill skill : CommonSkill.values())
+		{
+			if (skill.getId() == eventSkill.getId())
+			{
+				return;
+			}
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{

L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
@@ -90,7 +91,8 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
-		if (!CommonUtil.contains(_magicTypes, event.getSkill().getMagicType()))
+		final Skill eventSkill = event.getSkill();
+		if (!CommonUtil.contains(_magicTypes, eventSkill.getMagicType()))
 		{
 			return;
 		}
@@ -114,6 +116,15 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
+		// Ignore common skills.
+		for (CommonSkill skill : CommonSkill.values())
+		{
+			if (skill.getId() == eventSkill.getId())
+			{
+				return;
+			}
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
@@ -90,7 +91,8 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
-		if (!CommonUtil.contains(_magicTypes, event.getSkill().getMagicType()))
+		final Skill eventSkill = event.getSkill();
+		if (!CommonUtil.contains(_magicTypes, eventSkill.getMagicType()))
 		{
 			return;
 		}
@@ -114,6 +116,15 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
+		// Ignore common skills.
+		for (CommonSkill skill : CommonSkill.values())
+		{
+			if (skill.getId() == eventSkill.getId())
+			{
+				return;
+			}
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
@@ -90,7 +91,8 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
-		if (!CommonUtil.contains(_magicTypes, event.getSkill().getMagicType()))
+		final Skill eventSkill = event.getSkill();
+		if (!CommonUtil.contains(_magicTypes, eventSkill.getMagicType()))
 		{
 			return;
 		}
@@ -114,6 +116,15 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
+		// Ignore common skills.
+		for (CommonSkill skill : CommonSkill.values())
+		{
+			if (skill.getId() == eventSkill.getId())
+			{
+				return;
+			}
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
@@ -90,7 +91,8 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
-		if (!CommonUtil.contains(_magicTypes, event.getSkill().getMagicType()))
+		final Skill eventSkill = event.getSkill();
+		if (!CommonUtil.contains(_magicTypes, eventSkill.getMagicType()))
 		{
 			return;
 		}
@@ -114,6 +116,15 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
+		// Ignore common skills.
+		for (CommonSkill skill : CommonSkill.values())
+		{
+			if (skill.getId() == eventSkill.getId())
+			{
+				return;
+			}
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
@@ -90,7 +91,8 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
-		if (!CommonUtil.contains(_magicTypes, event.getSkill().getMagicType()))
+		final Skill eventSkill = event.getSkill();
+		if (!CommonUtil.contains(_magicTypes, eventSkill.getMagicType()))
 		{
 			return;
 		}
@@ -114,6 +116,15 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
+		// Ignore common skills.
+		for (CommonSkill skill : CommonSkill.values())
+		{
+			if (skill.getId() == eventSkill.getId())
+			{
+				return;
+			}
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
@@ -90,7 +91,8 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
-		if (!CommonUtil.contains(_magicTypes, event.getSkill().getMagicType()))
+		final Skill eventSkill = event.getSkill();
+		if (!CommonUtil.contains(_magicTypes, eventSkill.getMagicType()))
 		{
 			return;
 		}
@@ -114,6 +116,15 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
+		// Ignore common skills.
+		for (CommonSkill skill : CommonSkill.values())
+		{
+			if (skill.getId() == eventSkill.getId())
+			{
+				return;
+			}
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
@@ -90,7 +91,8 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
-		if (!CommonUtil.contains(_magicTypes, event.getSkill().getMagicType()))
+		final Skill eventSkill = event.getSkill();
+		if (!CommonUtil.contains(_magicTypes, eventSkill.getMagicType()))
 		{
 			return;
 		}
@@ -114,6 +116,15 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
+		// Ignore common skills.
+		for (CommonSkill skill : CommonSkill.values())
+		{
+			if (skill.getId() == eventSkill.getId())
+			{
+				return;
+			}
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
@@ -90,7 +91,8 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
-		if (!CommonUtil.contains(_magicTypes, event.getSkill().getMagicType()))
+		final Skill eventSkill = event.getSkill();
+		if (!CommonUtil.contains(_magicTypes, eventSkill.getMagicType()))
 		{
 			return;
 		}
@@ -114,6 +116,15 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
+		// Ignore common skills.
+		for (CommonSkill skill : CommonSkill.values())
+		{
+			if (skill.getId() == eventSkill.getId())
+			{
+				return;
+			}
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
@@ -90,7 +91,8 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
-		if (!CommonUtil.contains(_magicTypes, event.getSkill().getMagicType()))
+		final Skill eventSkill = event.getSkill();
+		if (!CommonUtil.contains(_magicTypes, eventSkill.getMagicType()))
 		{
 			return;
 		}
@@ -114,6 +116,15 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
+		// Ignore common skills.
+		for (CommonSkill skill : CommonSkill.values())
+		{
+			if (skill.getId() == eventSkill.getId())
+			{
+				return;
+			}
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{

L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
@@ -90,7 +91,8 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
-		if (!CommonUtil.contains(_magicTypes, event.getSkill().getMagicType()))
+		final Skill eventSkill = event.getSkill();
+		if (!CommonUtil.contains(_magicTypes, eventSkill.getMagicType()))
 		{
 			return;
 		}
@@ -114,6 +116,15 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
+		// Ignore common skills.
+		for (CommonSkill skill : CommonSkill.values())
+		{
+			if (skill.getId() == eventSkill.getId())
+			{
+				return;
+			}
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java

@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
 import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.BuffInfo;
+import org.l2jmobius.gameserver.model.skill.CommonSkill;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
 import org.l2jmobius.gameserver.model.skill.targets.TargetType;
@@ -90,7 +91,8 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
-		if (!CommonUtil.contains(_magicTypes, event.getSkill().getMagicType()))
+		final Skill eventSkill = event.getSkill();
+		if (!CommonUtil.contains(_magicTypes, eventSkill.getMagicType()))
 		{
 			return;
 		}
@@ -114,6 +116,15 @@ public class TriggerSkillByMagicType extends AbstractEffect
 			return;
 		}
 		
+		// Ignore common skills.
+		for (CommonSkill skill : CommonSkill.values())
+		{
+			if (skill.getId() == eventSkill.getId())
+			{
+				return;
+			}
+		}
+		
 		final Skill triggerSkill;
 		if (_skillLevelScaleTo <= 0)
 		{