From 79a629c9ca33efff3b732f857485532ea53998c8 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 17 Aug 2022 06:32:12 +0000 Subject: [PATCH] Fixed TriggerSkillByDamage effect handler. Contributed by nasseka. --- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../game/data/stats/skills/01900-01999.xml | 4 ++-- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../game/data/stats/skills/01900-01999.xml | 4 ++-- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../game/data/stats/skills/01900-01999.xml | 4 ++-- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../game/data/stats/skills/01900-01999.xml | 4 ++-- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../game/data/stats/skills/01900-01999.xml | 4 ++-- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../game/data/stats/skills/01900-01999.xml | 4 ++-- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../game/data/stats/skills/01900-01999.xml | 4 ++-- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../game/data/stats/skills/01900-01999.xml | 4 ++-- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../game/data/stats/skills/01900-01999.xml | 4 ++-- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../game/data/stats/skills/01900-01999.xml | 4 ++-- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../game/data/stats/skills/01900-01999.xml | 4 ++-- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../game/data/stats/skills/01900-01999.xml | 4 ++-- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- .../effecthandlers/TriggerSkillByDamage.java | 22 ++++++------------- 37 files changed, 199 insertions(+), 399 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/01900-01999.xml index 9d31d14eba..e2cf039409 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/01900-01999.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/01900-01999.xml @@ -371,11 +371,11 @@ true - Creature 100 SELF 1 + 30 1918 1 @@ -400,7 +400,7 @@ SINGLE - 20 + 30 LESS CASTER diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/01900-01999.xml index a377894c59..622144685a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/01900-01999.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/01900-01999.xml @@ -371,11 +371,11 @@ true - Creature 100 SELF 1 + 30 1918 1 @@ -400,7 +400,7 @@ SINGLE - 20 + 30 LESS CASTER diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/01900-01999.xml index bdd0ca80a5..b01afa2016 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/01900-01999.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/01900-01999.xml @@ -371,11 +371,11 @@ true - Creature 100 SELF 1 + 30 1918 1 @@ -400,7 +400,7 @@ SINGLE - 20 + 30 LESS CASTER diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml index a377894c59..622144685a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml @@ -371,11 +371,11 @@ true - Creature 100 SELF 1 + 30 1918 1 @@ -400,7 +400,7 @@ SINGLE - 20 + 30 LESS CASTER diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/01900-01999.xml index 07d5ffd1a4..c3349e4922 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/01900-01999.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/01900-01999.xml @@ -371,11 +371,11 @@ true - Creature 100 SELF 1 + 30 1918 1 @@ -400,7 +400,7 @@ SINGLE - 20 + 30 LESS CASTER diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/01900-01999.xml index cab9317a01..ec2088880f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/01900-01999.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/01900-01999.xml @@ -371,11 +371,11 @@ true - Creature 100 SELF 1 + 30 1918 1 @@ -400,7 +400,7 @@ SINGLE - 20 + 30 LESS CASTER diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml index 6b22a24b23..a7d51aa290 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml @@ -371,11 +371,11 @@ true - Creature 100 SELF 1 + 30 1918 1 @@ -400,7 +400,7 @@ SINGLE - 20 + 30 LESS CASTER diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/01900-01999.xml index ac166eb8cd..eeeaf737c7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/01900-01999.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/01900-01999.xml @@ -371,11 +371,11 @@ true - Creature 100 SELF 1 + 30 1918 1 @@ -400,7 +400,7 @@ SINGLE - 20 + 30 LESS CASTER diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/01900-01999.xml index c7e23791ec..778d6cecf8 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/01900-01999.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/01900-01999.xml @@ -468,11 +468,11 @@ true - Creature 100 SELF 1 + 30 1918 1 @@ -497,7 +497,7 @@ SINGLE - 20 + 30 LESS CASTER diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/01900-01999.xml index 8f86b63f99..59126d757a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/01900-01999.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/01900-01999.xml @@ -468,11 +468,11 @@ true - Creature 100 SELF 1 + 30 1918 1 @@ -497,7 +497,7 @@ SINGLE - 20 + 30 LESS CASTER diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/01900-01999.xml index 8f86b63f99..59126d757a 100644 --- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/01900-01999.xml +++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/skills/01900-01999.xml @@ -468,11 +468,11 @@ true - Creature 100 SELF 1 + 30 1918 1 @@ -497,7 +497,7 @@ SINGLE - 20 + 30 LESS CASTER diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/01900-01999.xml index 8f86b63f99..59126d757a 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/01900-01999.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/01900-01999.xml @@ -468,11 +468,11 @@ true - Creature 100 SELF 1 + 30 1918 1 @@ -497,7 +497,7 @@ SINGLE - 20 + 30 LESS CASTER diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index f1e125b473..1e1b9045b3 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -92,7 +92,7 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent)) + if ((_hpPercent < 100) && (event.getTarget().getCurrentHpPercent() > _hpPercent)) { return; } @@ -102,10 +102,11 @@ public class TriggerSkillByDamage extends AbstractEffect return; } + Skill triggerSkill = _skill.getSkill(); WorldObject target = null; try { - target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), _skill.getSkill(), false, false, false); + target = TargetHandler.getInstance().getHandler(_targetType).getTarget(event.getTarget(), event.getAttacker(), triggerSkill, false, false, false); } catch (Exception e) { @@ -116,25 +117,16 @@ public class TriggerSkillByDamage extends AbstractEffect return; } - final Skill triggerSkill; - if (_skillLevelScaleTo <= 0) + if (_skillLevelScaleTo > 0) { - triggerSkill = _skill.getSkill(); - } - else - { - final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(_skill.getSkillId()); + final BuffInfo buffInfo = ((Creature) target).getEffectList().getBuffInfoBySkillId(triggerSkill.getId()); if (buffInfo != null) { - triggerSkill = SkillData.getInstance().getSkill(_skill.getSkillId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); - } - else - { - triggerSkill = _skill.getSkill(); + triggerSkill = SkillData.getInstance().getSkill(triggerSkill.getId(), Math.min(_skillLevelScaleTo, buffInfo.getSkill().getLevel() + 1)); } } - SkillCaster.triggerCast(event.getAttacker(), (Creature) target, triggerSkill); + SkillCaster.triggerCast(event.getTarget(), (Creature) target, triggerSkill); } @Override