From c75c62ea53219fbbfd737bd62d2a5b0596a23048 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 3 Apr 2022 05:11:38 +0000
Subject: [PATCH] Item skill support for OTHER target type.

---
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../dist/game/data/stats/skills/02000-02099.xml                | 1 -
 .../dist/game/data/stats/skills/21200-21299.xml                | 2 +-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../dist/game/data/stats/skills/02000-02099.xml                | 1 -
 .../dist/game/data/stats/skills/21200-21299.xml                | 2 +-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../dist/game/data/stats/skills/02000-02099.xml                | 1 -
 .../dist/game/data/stats/skills/21200-21299.xml                | 2 +-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../dist/game/data/stats/skills/02000-02099.xml                | 1 -
 .../dist/game/data/stats/skills/21200-21299.xml                | 2 +-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../dist/game/data/stats/skills/02000-02099.xml                | 1 -
 .../dist/game/data/stats/skills/21200-21299.xml                | 2 +-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../dist/game/data/stats/skills/02000-02099.xml                | 1 -
 .../dist/game/data/stats/skills/21200-21299.xml                | 2 +-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../dist/game/data/stats/skills/02000-02099.xml                | 1 -
 .../dist/game/data/stats/skills/21200-21299.xml                | 2 +-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../dist/game/data/stats/skills/02000-02099.xml                | 1 -
 .../dist/game/data/stats/skills/21200-21299.xml                | 2 +-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../dist/game/data/stats/skills/02000-02099.xml                | 1 -
 .../dist/game/data/stats/skills/21200-21299.xml                | 2 +-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../dist/game/data/stats/skills/02000-02099.xml                | 1 -
 .../dist/game/data/stats/skills/21200-21299.xml                | 2 +-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../dist/game/data/stats/skills/02000-02099.xml                | 1 -
 .../dist/game/data/stats/skills/21200-21299.xml                | 2 +-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../dist/game/data/stats/skills/02000-02099.xml                | 1 -
 .../dist/game/data/stats/skills/21200-21299.xml                | 2 +-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../dist/game/data/stats/skills/02000-02099.xml                | 1 -
 .../dist/game/data/stats/skills/21200-21299.xml                | 2 +-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 .../data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java | 3 ++-
 49 files changed, 59 insertions(+), 49 deletions(-)

diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index f5bb005445..c50874941b 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/02000-02099.xml
index faa4ffb2c0..b4f1fa944c 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/02000-02099.xml
@@ -96,7 +96,6 @@
 		<reuseDelay>2000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
-		<!-- FIXME: This should be OTHERS -->
 		<targetType>OTHERS</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/21200-21299.xml
index 4ec4424940..cbb7a66444 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/21200-21299.xml
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/21200-21299.xml
@@ -1865,7 +1865,7 @@
 		<staticReuse>true</staticReuse>
 		<isMagic>2</isMagic>
 		<reuseDelay>20000</reuseDelay>
-		<targetType>OTHERS</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpCheckAbnormal">
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index 48f3f52d1d..a977e68fc5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/02000-02099.xml
index a33c13a1fb..60f805e434 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/02000-02099.xml
@@ -96,7 +96,6 @@
 		<reuseDelay>2000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
-		<!-- FIXME: This should be OTHERS -->
 		<targetType>OTHERS</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/21200-21299.xml
index c98d54ed9d..3e0f793cd2 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/21200-21299.xml
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/21200-21299.xml
@@ -1866,7 +1866,7 @@
 		<staticReuse>true</staticReuse>
 		<isMagic>2</isMagic>
 		<reuseDelay>20000</reuseDelay>
-		<targetType>OTHERS</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpCheckAbnormal">
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index 48f3f52d1d..a977e68fc5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/02000-02099.xml
index a33c13a1fb..60f805e434 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/02000-02099.xml
@@ -96,7 +96,6 @@
 		<reuseDelay>2000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
-		<!-- FIXME: This should be OTHERS -->
 		<targetType>OTHERS</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/21200-21299.xml
index 9b5279a1d2..e84641f5ce 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/21200-21299.xml
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/21200-21299.xml
@@ -1866,7 +1866,7 @@
 		<staticReuse>true</staticReuse>
 		<isMagic>2</isMagic>
 		<reuseDelay>20000</reuseDelay>
-		<targetType>OTHERS</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpCheckAbnormal">
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index 48f3f52d1d..a977e68fc5 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/02000-02099.xml
index a33c13a1fb..60f805e434 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/02000-02099.xml
@@ -96,7 +96,6 @@
 		<reuseDelay>2000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
-		<!-- FIXME: This should be OTHERS -->
 		<targetType>OTHERS</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/21200-21299.xml
index ea3d6e7f1b..6e310e1076 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/21200-21299.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/21200-21299.xml
@@ -1894,7 +1894,7 @@
 		<staticReuse>true</staticReuse>
 		<isMagic>2</isMagic>
 		<reuseDelay>20000</reuseDelay>
-		<targetType>OTHERS</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpCheckAbnormal">
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index 80afc492c2..3b2757b006 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/02000-02099.xml
index c51cb97bef..c2754434f3 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/02000-02099.xml
@@ -96,7 +96,6 @@
 		<reuseDelay>2000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
-		<!-- FIXME: This should be OTHERS -->
 		<targetType>OTHERS</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/21200-21299.xml
index 75f82d5d87..ec1a48493a 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/21200-21299.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/21200-21299.xml
@@ -1893,7 +1893,7 @@
 		<staticReuse>true</staticReuse>
 		<isMagic>2</isMagic>
 		<reuseDelay>20000</reuseDelay>
-		<targetType>OTHERS</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpCheckAbnormal">
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index 48f3f52d1d..a977e68fc5 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/02000-02099.xml
index 1d25ff52aa..121f04edee 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/02000-02099.xml
@@ -116,7 +116,6 @@
 		<reuseDelay>2000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
-		<!-- FIXME: This should be OTHERS -->
 		<targetType>OTHERS</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/21200-21299.xml
index 290ecf31fa..c29de59cb3 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/21200-21299.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/21200-21299.xml
@@ -1893,7 +1893,7 @@
 		<staticReuse>true</staticReuse>
 		<isMagic>2</isMagic>
 		<reuseDelay>20000</reuseDelay>
-		<targetType>OTHERS</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpCheckAbnormal">
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index 48f3f52d1d..a977e68fc5 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/02000-02099.xml
index fc0900c30e..0a10f96766 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/02000-02099.xml
@@ -116,7 +116,6 @@
 		<reuseDelay>2000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
-		<!-- FIXME: This should be OTHERS -->
 		<targetType>OTHERS</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/21200-21299.xml
index 334424d31f..1fd9a43bdb 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/21200-21299.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/21200-21299.xml
@@ -1893,7 +1893,7 @@
 		<staticReuse>true</staticReuse>
 		<isMagic>2</isMagic>
 		<reuseDelay>20000</reuseDelay>
-		<targetType>OTHERS</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpCheckAbnormal">
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index dd09e4a2c9..c51c25532d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/02000-02099.xml
index 1ad703ad63..4b9999b2ba 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/02000-02099.xml
@@ -116,7 +116,6 @@
 		<reuseDelay>2000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
-		<!-- FIXME: This should be OTHERS -->
 		<targetType>OTHERS</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/21200-21299.xml
index 0936cbdb61..a2300615a1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/21200-21299.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/21200-21299.xml
@@ -1893,7 +1893,7 @@
 		<staticReuse>true</staticReuse>
 		<isMagic>2</isMagic>
 		<reuseDelay>20000</reuseDelay>
-		<targetType>OTHERS</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpCheckAbnormal">
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index dd09e4a2c9..c51c25532d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/02000-02099.xml
index 8ef0b8153f..56a44449bc 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/02000-02099.xml
@@ -116,7 +116,6 @@
 		<reuseDelay>2000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
-		<!-- FIXME: This should be OTHERS -->
 		<targetType>OTHERS</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/21200-21299.xml
index dad1e18044..555aa2da4a 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/21200-21299.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/21200-21299.xml
@@ -1875,7 +1875,7 @@
 		<staticReuse>true</staticReuse>
 		<isMagic>2</isMagic>
 		<reuseDelay>20000</reuseDelay>
-		<targetType>OTHERS</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpCheckAbnormal">
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index dd09e4a2c9..c51c25532d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/02000-02099.xml
index b071c9bf76..216f1fbd4c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/02000-02099.xml
@@ -116,7 +116,6 @@
 		<reuseDelay>2000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
-		<!-- FIXME: This should be OTHERS -->
 		<targetType>OTHERS</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/21200-21299.xml
index d9de99c6f2..570b7888a7 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/21200-21299.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/21200-21299.xml
@@ -1875,7 +1875,7 @@
 		<staticReuse>true</staticReuse>
 		<isMagic>2</isMagic>
 		<reuseDelay>20000</reuseDelay>
-		<targetType>OTHERS</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpCheckAbnormal">
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index dc13675637..fefeabfa20 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/02000-02099.xml
index 3b6e16cc8e..6321258ad3 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/02000-02099.xml
@@ -116,7 +116,6 @@
 		<reuseDelay>2000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
-		<!-- FIXME: This should be OTHERS -->
 		<targetType>OTHERS</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/21200-21299.xml
index a484fb56b5..de14ed0f5c 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/21200-21299.xml
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/21200-21299.xml
@@ -1875,7 +1875,7 @@
 		<staticReuse>true</staticReuse>
 		<isMagic>2</isMagic>
 		<reuseDelay>20000</reuseDelay>
-		<targetType>OTHERS</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpCheckAbnormal">
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index dc13675637..fefeabfa20 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/02000-02099.xml
index cacc7e94c1..26c1a5a20b 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/02000-02099.xml
@@ -116,7 +116,6 @@
 		<reuseDelay>2000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
-		<!-- FIXME: This should be OTHERS -->
 		<targetType>OTHERS</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/21200-21299.xml
index e51b576f6b..83492f3ad2 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/21200-21299.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/21200-21299.xml
@@ -1875,7 +1875,7 @@
 		<staticReuse>true</staticReuse>
 		<isMagic>2</isMagic>
 		<reuseDelay>20000</reuseDelay>
-		<targetType>OTHERS</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpCheckAbnormal">
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index 0cc6264451..945ce4034c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index bc333f5f17..e919fcb43f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index bc333f5f17..e919fcb43f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index bc333f5f17..e919fcb43f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index bc333f5f17..e919fcb43f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index 6ade3d5ae8..3f6e0abe55 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index bc333f5f17..e919fcb43f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/02000-02099.xml
index a33c13a1fb..60f805e434 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/02000-02099.xml
@@ -96,7 +96,6 @@
 		<reuseDelay>2000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
-		<!-- FIXME: This should be OTHERS -->
 		<targetType>OTHERS</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/21200-21299.xml
index ea3d6e7f1b..6e310e1076 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/21200-21299.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/21200-21299.xml
@@ -1894,7 +1894,7 @@
 		<staticReuse>true</staticReuse>
 		<isMagic>2</isMagic>
 		<reuseDelay>20000</reuseDelay>
-		<targetType>OTHERS</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
 			<condition name="OpCheckAbnormal">
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index 96f7322293..6e7013b597 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index 96f7322293..6e7013b597 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index 96f7322293..6e7013b597 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
index 96f7322293..6e7013b597 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.SkillCaster;
+import org.l2jmobius.gameserver.model.skill.targets.TargetType;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
@@ -124,7 +125,7 @@ public class ItemSkillsTemplate implements IItemHandler
 				}
 				else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect())
 				{
-					SkillCaster.triggerCast(playable, null, itemSkill, item, false);
+					SkillCaster.triggerCast(playable, itemSkill.getTargetType() == TargetType.OTHERS ? playable.getTarget() : null, itemSkill, item, false);
 					successfulUse = true;
 				}
 				else