From 97a8caa81e430b47ebf48acee121de778dcd8f39 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 12 May 2019 04:05:19 +0000 Subject: [PATCH] TeleportToTarget effect start when target is in LoS. --- .../scripts/handlers/effecthandlers/TeleportToTarget.java | 6 ++++++ .../scripts/handlers/effecthandlers/TeleportToTarget.java | 6 ++++++ .../scripts/handlers/effecthandlers/TeleportToTarget.java | 6 ++++++ .../scripts/handlers/effecthandlers/TeleportToTarget.java | 6 ++++++ .../scripts/handlers/effecthandlers/TeleportToTarget.java | 6 ++++++ .../scripts/handlers/effecthandlers/TeleportToTarget.java | 6 ++++++ .../scripts/handlers/effecthandlers/TeleportToTarget.java | 6 ++++++ .../scripts/handlers/effecthandlers/TeleportToTarget.java | 6 ++++++ .../scripts/handlers/effecthandlers/TeleportToTarget.java | 6 ++++++ .../scripts/handlers/effecthandlers/TeleportToTarget.java | 6 ++++++ .../scripts/handlers/effecthandlers/TeleportToTarget.java | 6 ++++++ .../scripts/handlers/effecthandlers/TeleportToTarget.java | 6 ++++++ .../scripts/handlers/effecthandlers/TeleportToTarget.java | 6 ++++++ 13 files changed, 78 insertions(+) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 216e5bde2e..83fd8c52fe 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -46,6 +46,12 @@ public final class TeleportToTarget extends AbstractEffect return EffectType.TELEPORT_TO_TARGET; } + @Override + public boolean canStart(Creature effector, Creature effected, Skill skill) + { + return (effected != null) && GeoEngine.getInstance().canSeeTarget(effected, effector); + } + @Override public boolean isInstant() { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 216e5bde2e..83fd8c52fe 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -46,6 +46,12 @@ public final class TeleportToTarget extends AbstractEffect return EffectType.TELEPORT_TO_TARGET; } + @Override + public boolean canStart(Creature effector, Creature effected, Skill skill) + { + return (effected != null) && GeoEngine.getInstance().canSeeTarget(effected, effector); + } + @Override public boolean isInstant() { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 216e5bde2e..83fd8c52fe 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -46,6 +46,12 @@ public final class TeleportToTarget extends AbstractEffect return EffectType.TELEPORT_TO_TARGET; } + @Override + public boolean canStart(Creature effector, Creature effected, Skill skill) + { + return (effected != null) && GeoEngine.getInstance().canSeeTarget(effected, effector); + } + @Override public boolean isInstant() { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 216e5bde2e..83fd8c52fe 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -46,6 +46,12 @@ public final class TeleportToTarget extends AbstractEffect return EffectType.TELEPORT_TO_TARGET; } + @Override + public boolean canStart(Creature effector, Creature effected, Skill skill) + { + return (effected != null) && GeoEngine.getInstance().canSeeTarget(effected, effector); + } + @Override public boolean isInstant() { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 216e5bde2e..83fd8c52fe 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -46,6 +46,12 @@ public final class TeleportToTarget extends AbstractEffect return EffectType.TELEPORT_TO_TARGET; } + @Override + public boolean canStart(Creature effector, Creature effected, Skill skill) + { + return (effected != null) && GeoEngine.getInstance().canSeeTarget(effected, effector); + } + @Override public boolean isInstant() { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 216e5bde2e..83fd8c52fe 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -46,6 +46,12 @@ public final class TeleportToTarget extends AbstractEffect return EffectType.TELEPORT_TO_TARGET; } + @Override + public boolean canStart(Creature effector, Creature effected, Skill skill) + { + return (effected != null) && GeoEngine.getInstance().canSeeTarget(effected, effector); + } + @Override public boolean isInstant() { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 216e5bde2e..83fd8c52fe 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -46,6 +46,12 @@ public final class TeleportToTarget extends AbstractEffect return EffectType.TELEPORT_TO_TARGET; } + @Override + public boolean canStart(Creature effector, Creature effected, Skill skill) + { + return (effected != null) && GeoEngine.getInstance().canSeeTarget(effected, effector); + } + @Override public boolean isInstant() { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index bd419c66ae..96840d9100 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -47,6 +47,12 @@ public final class TeleportToTarget extends AbstractEffect return EffectType.TELEPORT_TO_TARGET; } + @Override + public boolean canStart(BuffInfo info) + { + return (info.getEffected() != null) && GeoEngine.getInstance().canSeeTarget(info.getEffected(), info.getEffector()); + } + @Override public boolean isInstant() { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 216e5bde2e..83fd8c52fe 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -46,6 +46,12 @@ public final class TeleportToTarget extends AbstractEffect return EffectType.TELEPORT_TO_TARGET; } + @Override + public boolean canStart(Creature effector, Creature effected, Skill skill) + { + return (effected != null) && GeoEngine.getInstance().canSeeTarget(effected, effector); + } + @Override public boolean isInstant() { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 216e5bde2e..83fd8c52fe 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -46,6 +46,12 @@ public final class TeleportToTarget extends AbstractEffect return EffectType.TELEPORT_TO_TARGET; } + @Override + public boolean canStart(Creature effector, Creature effected, Skill skill) + { + return (effected != null) && GeoEngine.getInstance().canSeeTarget(effected, effector); + } + @Override public boolean isInstant() { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 216e5bde2e..83fd8c52fe 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -46,6 +46,12 @@ public final class TeleportToTarget extends AbstractEffect return EffectType.TELEPORT_TO_TARGET; } + @Override + public boolean canStart(Creature effector, Creature effected, Skill skill) + { + return (effected != null) && GeoEngine.getInstance().canSeeTarget(effected, effector); + } + @Override public boolean isInstant() { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 216e5bde2e..83fd8c52fe 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -46,6 +46,12 @@ public final class TeleportToTarget extends AbstractEffect return EffectType.TELEPORT_TO_TARGET; } + @Override + public boolean canStart(Creature effector, Creature effected, Skill skill) + { + return (effected != null) && GeoEngine.getInstance().canSeeTarget(effected, effector); + } + @Override public boolean isInstant() { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index 216e5bde2e..83fd8c52fe 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -46,6 +46,12 @@ public final class TeleportToTarget extends AbstractEffect return EffectType.TELEPORT_TO_TARGET; } + @Override + public boolean canStart(Creature effector, Creature effected, Skill skill) + { + return (effected != null) && GeoEngine.getInstance().canSeeTarget(effected, effector); + } + @Override public boolean isInstant() {