Manage summon skill action with SELF target type.

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}

L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/playeractions/PetSkillUse.java

@@ -23,6 +23,8 @@ import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.skill.CommonSkill;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -60,9 +62,13 @@ public class PetSkillUse implements IPlayerActionHandler
 		{
 			final int skillLevel = PetDataTable.getInstance().getPetData(pet.getId()).getAvailableLevel(data.getOptionId(), pet.getLevel());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					pet.setTarget(player.getTarget());
-				pet.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					pet.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 			
 			if (data.getOptionId() == CommonSkill.PET_SWITCH_STANCE.getId())

L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/playeractions/ServitorSkillUse.java

@@ -22,6 +22,8 @@ import org.l2jmobius.gameserver.handler.IPlayerActionHandler;
 import org.l2jmobius.gameserver.model.ActionDataHolder;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.actor.Summon;
+import org.l2jmobius.gameserver.model.skill.Skill;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**
@@ -50,9 +52,13 @@ public class ServitorSkillUse implements IPlayerActionHandler
 			
 			final int skillLevel = PetSkillData.getInstance().getAvailableLevel(servitor, data.getOptionId());
 			if (skillLevel > 0)
+			{
+				final Skill skill = SkillData.getInstance().getSkill(data.getOptionId(), skillLevel);
+				if (skill != null)
 				{
 					servitor.setTarget(player.getTarget());
-				servitor.useMagic(SkillData.getInstance().getSkill(data.getOptionId(), skillLevel), null, ctrlPressed, shiftPressed);
+					servitor.useMagic(skill, null, (skill.getTargetType() == TargetType.SELF) || ctrlPressed, shiftPressed);
+				}
 			}
 		});
 	}