lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Item skill support for OTHER target type.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-04-03 05:11:38 +00:00
parent 8734a31f33
commit c75c62ea53
49 changed files with 59 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

1
L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@@ -96,7 +96,6 @@
<reuseDelay>2000</reuseDelay> <reuseDelay>2000</reuseDelay>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<!-- FIXME: This should be OTHERS -->
<targetType>OTHERS</targetType> <targetType>OTHERS</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
</skill> </skill>

2
L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/21200-21299.xml vendored
View File

@@ -1865,7 +1865,7 @@
<staticReuse>true</staticReuse> <staticReuse>true</staticReuse>
<isMagic>2</isMagic> <isMagic>2</isMagic>
<reuseDelay>20000</reuseDelay> <reuseDelay>20000</reuseDelay>
<targetType>OTHERS</targetType> <targetType>SELF</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="OpCheckAbnormal"> <condition name="OpCheckAbnormal">

3
L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

1
L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@@ -96,7 +96,6 @@
<reuseDelay>2000</reuseDelay> <reuseDelay>2000</reuseDelay>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<!-- FIXME: This should be OTHERS -->
<targetType>OTHERS</targetType> <targetType>OTHERS</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
</skill> </skill>

2
L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/21200-21299.xml vendored
View File

@@ -1866,7 +1866,7 @@
<staticReuse>true</staticReuse> <staticReuse>true</staticReuse>
<isMagic>2</isMagic> <isMagic>2</isMagic>
<reuseDelay>20000</reuseDelay> <reuseDelay>20000</reuseDelay>
<targetType>OTHERS</targetType> <targetType>SELF</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="OpCheckAbnormal"> <condition name="OpCheckAbnormal">

3
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

1
L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@@ -96,7 +96,6 @@
<reuseDelay>2000</reuseDelay> <reuseDelay>2000</reuseDelay>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<!-- FIXME: This should be OTHERS -->
<targetType>OTHERS</targetType> <targetType>OTHERS</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
</skill> </skill>

2
L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/21200-21299.xml vendored
View File

@@ -1866,7 +1866,7 @@
<staticReuse>true</staticReuse> <staticReuse>true</staticReuse>
<isMagic>2</isMagic> <isMagic>2</isMagic>
<reuseDelay>20000</reuseDelay> <reuseDelay>20000</reuseDelay>
<targetType>OTHERS</targetType> <targetType>SELF</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="OpCheckAbnormal"> <condition name="OpCheckAbnormal">

3
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

1
L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@@ -96,7 +96,6 @@
<reuseDelay>2000</reuseDelay> <reuseDelay>2000</reuseDelay>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<!-- FIXME: This should be OTHERS -->
<targetType>OTHERS</targetType> <targetType>OTHERS</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
</skill> </skill>

2
L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/21200-21299.xml vendored
View File

@@ -1894,7 +1894,7 @@
<staticReuse>true</staticReuse> <staticReuse>true</staticReuse>
<isMagic>2</isMagic> <isMagic>2</isMagic>
<reuseDelay>20000</reuseDelay> <reuseDelay>20000</reuseDelay>
<targetType>OTHERS</targetType> <targetType>SELF</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="OpCheckAbnormal"> <condition name="OpCheckAbnormal">

3
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

1
L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@@ -96,7 +96,6 @@
<reuseDelay>2000</reuseDelay> <reuseDelay>2000</reuseDelay>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<!-- FIXME: This should be OTHERS -->
<targetType>OTHERS</targetType> <targetType>OTHERS</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
</skill> </skill>

2
L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/21200-21299.xml vendored
View File

@@ -1893,7 +1893,7 @@
<staticReuse>true</staticReuse> <staticReuse>true</staticReuse>
<isMagic>2</isMagic> <isMagic>2</isMagic>
<reuseDelay>20000</reuseDelay> <reuseDelay>20000</reuseDelay>
<targetType>OTHERS</targetType> <targetType>SELF</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="OpCheckAbnormal"> <condition name="OpCheckAbnormal">

3
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

1
L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@@ -116,7 +116,6 @@
<reuseDelay>2000</reuseDelay> <reuseDelay>2000</reuseDelay>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<!-- FIXME: This should be OTHERS -->
<targetType>OTHERS</targetType> <targetType>OTHERS</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
</skill> </skill>

2
L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/21200-21299.xml vendored
View File

@@ -1893,7 +1893,7 @@
<staticReuse>true</staticReuse> <staticReuse>true</staticReuse>
<isMagic>2</isMagic> <isMagic>2</isMagic>
<reuseDelay>20000</reuseDelay> <reuseDelay>20000</reuseDelay>
<targetType>OTHERS</targetType> <targetType>SELF</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="OpCheckAbnormal"> <condition name="OpCheckAbnormal">

3
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

1
L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@@ -116,7 +116,6 @@
<reuseDelay>2000</reuseDelay> <reuseDelay>2000</reuseDelay>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<!-- FIXME: This should be OTHERS -->
<targetType>OTHERS</targetType> <targetType>OTHERS</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
</skill> </skill>

2
L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/21200-21299.xml vendored
View File

@@ -1893,7 +1893,7 @@
<staticReuse>true</staticReuse> <staticReuse>true</staticReuse>
<isMagic>2</isMagic> <isMagic>2</isMagic>
<reuseDelay>20000</reuseDelay> <reuseDelay>20000</reuseDelay>
<targetType>OTHERS</targetType> <targetType>SELF</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="OpCheckAbnormal"> <condition name="OpCheckAbnormal">

3
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

1
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@@ -116,7 +116,6 @@
<reuseDelay>2000</reuseDelay> <reuseDelay>2000</reuseDelay>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<!-- FIXME: This should be OTHERS -->
<targetType>OTHERS</targetType> <targetType>OTHERS</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
</skill> </skill>

2
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/21200-21299.xml vendored
View File

@@ -1893,7 +1893,7 @@
<staticReuse>true</staticReuse> <staticReuse>true</staticReuse>
<isMagic>2</isMagic> <isMagic>2</isMagic>
<reuseDelay>20000</reuseDelay> <reuseDelay>20000</reuseDelay>
<targetType>OTHERS</targetType> <targetType>SELF</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="OpCheckAbnormal"> <condition name="OpCheckAbnormal">

3
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

1
L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@@ -116,7 +116,6 @@
<reuseDelay>2000</reuseDelay> <reuseDelay>2000</reuseDelay>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<!-- FIXME: This should be OTHERS -->
<targetType>OTHERS</targetType> <targetType>OTHERS</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
</skill> </skill>

2
L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/21200-21299.xml vendored
View File

@@ -1875,7 +1875,7 @@
<staticReuse>true</staticReuse> <staticReuse>true</staticReuse>
<isMagic>2</isMagic> <isMagic>2</isMagic>
<reuseDelay>20000</reuseDelay> <reuseDelay>20000</reuseDelay>
<targetType>OTHERS</targetType> <targetType>SELF</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="OpCheckAbnormal"> <condition name="OpCheckAbnormal">

3
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

1
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@@ -116,7 +116,6 @@
<reuseDelay>2000</reuseDelay> <reuseDelay>2000</reuseDelay>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<!-- FIXME: This should be OTHERS -->
<targetType>OTHERS</targetType> <targetType>OTHERS</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
</skill> </skill>

2
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/21200-21299.xml vendored
View File

@@ -1875,7 +1875,7 @@
<staticReuse>true</staticReuse> <staticReuse>true</staticReuse>
<isMagic>2</isMagic> <isMagic>2</isMagic>
<reuseDelay>20000</reuseDelay> <reuseDelay>20000</reuseDelay>
<targetType>OTHERS</targetType> <targetType>SELF</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="OpCheckAbnormal"> <condition name="OpCheckAbnormal">

3
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

1
L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@@ -116,7 +116,6 @@
<reuseDelay>2000</reuseDelay> <reuseDelay>2000</reuseDelay>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<!-- FIXME: This should be OTHERS -->
<targetType>OTHERS</targetType> <targetType>OTHERS</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
</skill> </skill>

2
L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/21200-21299.xml vendored
View File

@@ -1875,7 +1875,7 @@
<staticReuse>true</staticReuse> <staticReuse>true</staticReuse>
<isMagic>2</isMagic> <isMagic>2</isMagic>
<reuseDelay>20000</reuseDelay> <reuseDelay>20000</reuseDelay>
<targetType>OTHERS</targetType> <targetType>SELF</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="OpCheckAbnormal"> <condition name="OpCheckAbnormal">

3
L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

1
L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@@ -116,7 +116,6 @@
<reuseDelay>2000</reuseDelay> <reuseDelay>2000</reuseDelay>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<!-- FIXME: This should be OTHERS -->
<targetType>OTHERS</targetType> <targetType>OTHERS</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
</skill> </skill>

2
L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/21200-21299.xml vendored
View File

@@ -1875,7 +1875,7 @@
<staticReuse>true</staticReuse> <staticReuse>true</staticReuse>
<isMagic>2</isMagic> <isMagic>2</isMagic>
<reuseDelay>20000</reuseDelay> <reuseDelay>20000</reuseDelay>
<targetType>OTHERS</targetType> <targetType>SELF</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="OpCheckAbnormal"> <condition name="OpCheckAbnormal">

3
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

3
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

3
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

3
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

3
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

3
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

3
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

1
L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/02000-02099.xml vendored
View File

@@ -96,7 +96,6 @@
<reuseDelay>2000</reuseDelay> <reuseDelay>2000</reuseDelay>
<magicCriticalRate>5</magicCriticalRate> <magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>0</hitCancelTime> <hitCancelTime>0</hitCancelTime>
<!-- FIXME: This should be OTHERS -->
<targetType>OTHERS</targetType> <targetType>OTHERS</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
</skill> </skill>

2
L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/21200-21299.xml vendored
View File

@@ -1894,7 +1894,7 @@
<staticReuse>true</staticReuse> <staticReuse>true</staticReuse>
<isMagic>2</isMagic> <isMagic>2</isMagic>
<reuseDelay>20000</reuseDelay> <reuseDelay>20000</reuseDelay>
<targetType>OTHERS</targetType> <targetType>SELF</targetType>
<affectScope>SINGLE</affectScope> <affectScope>SINGLE</affectScope>
<conditions> <conditions>
<condition name="OpCheckAbnormal"> <condition name="OpCheckAbnormal">

3
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

3
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

3
L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else

3
L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item; import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill; import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.model.skill.SkillCaster; 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.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; 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()) 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; successfulUse = true;
} }
else else