From 0ebddd779a36f0ca8ff569464f0f7e5e2d2e6e83 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 1 Dec 2022 04:31:18 +0000 Subject: [PATCH] Force TriggerSkillByDualRange cast when necessary. --- .../handlers/effecthandlers/TriggerSkillByDualRange.java | 7 ++++++- .../handlers/effecthandlers/TriggerSkillByDualRange.java | 7 ++++++- .../handlers/effecthandlers/TriggerSkillByDualRange.java | 7 ++++++- .../handlers/effecthandlers/TriggerSkillByDualRange.java | 7 ++++++- .../handlers/effecthandlers/TriggerSkillByDualRange.java | 7 ++++++- .../handlers/effecthandlers/TriggerSkillByDualRange.java | 7 ++++++- 6 files changed, 36 insertions(+), 6 deletions(-) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java index 259cea56c1..453b9a57b4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java @@ -72,6 +72,11 @@ public class TriggerSkillByDualRange extends AbstractEffect return; } - effector.getActingPlayer().useMagic(triggerSkill, null, false, triggerSkill.getCastRange() > 600); + if (effected.isPlayable() && !effected.isAutoAttackable(effector)) + { + effector.getActingPlayer().updatePvPStatus(); + } + + effector.getActingPlayer().useMagic(triggerSkill, null, true, triggerSkill.getCastRange() > 600); } } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java index 259cea56c1..453b9a57b4 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java @@ -72,6 +72,11 @@ public class TriggerSkillByDualRange extends AbstractEffect return; } - effector.getActingPlayer().useMagic(triggerSkill, null, false, triggerSkill.getCastRange() > 600); + if (effected.isPlayable() && !effected.isAutoAttackable(effector)) + { + effector.getActingPlayer().updatePvPStatus(); + } + + effector.getActingPlayer().useMagic(triggerSkill, null, true, triggerSkill.getCastRange() > 600); } } diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java index 259cea56c1..453b9a57b4 100644 --- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java +++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java @@ -72,6 +72,11 @@ public class TriggerSkillByDualRange extends AbstractEffect return; } - effector.getActingPlayer().useMagic(triggerSkill, null, false, triggerSkill.getCastRange() > 600); + if (effected.isPlayable() && !effected.isAutoAttackable(effector)) + { + effector.getActingPlayer().updatePvPStatus(); + } + + effector.getActingPlayer().useMagic(triggerSkill, null, true, triggerSkill.getCastRange() > 600); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java index 259cea56c1..453b9a57b4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java @@ -72,6 +72,11 @@ public class TriggerSkillByDualRange extends AbstractEffect return; } - effector.getActingPlayer().useMagic(triggerSkill, null, false, triggerSkill.getCastRange() > 600); + if (effected.isPlayable() && !effected.isAutoAttackable(effector)) + { + effector.getActingPlayer().updatePvPStatus(); + } + + effector.getActingPlayer().useMagic(triggerSkill, null, true, triggerSkill.getCastRange() > 600); } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java index 259cea56c1..453b9a57b4 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java @@ -72,6 +72,11 @@ public class TriggerSkillByDualRange extends AbstractEffect return; } - effector.getActingPlayer().useMagic(triggerSkill, null, false, triggerSkill.getCastRange() > 600); + if (effected.isPlayable() && !effected.isAutoAttackable(effector)) + { + effector.getActingPlayer().updatePvPStatus(); + } + + effector.getActingPlayer().useMagic(triggerSkill, null, true, triggerSkill.getCastRange() > 600); } } diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java index 259cea56c1..453b9a57b4 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java +++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDualRange.java @@ -72,6 +72,11 @@ public class TriggerSkillByDualRange extends AbstractEffect return; } - effector.getActingPlayer().useMagic(triggerSkill, null, false, triggerSkill.getCastRange() > 600); + if (effected.isPlayable() && !effected.isAutoAttackable(effector)) + { + effector.getActingPlayer().updatePvPStatus(); + } + + effector.getActingPlayer().useMagic(triggerSkill, null, true, triggerSkill.getCastRange() > 600); } }