diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index d80092098a..15e5264c8b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index f8b56d78a3..1645a3b64c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index a19d80f517..b0cb3cb803 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index b82b68a6d1..3326ac395c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 8bd126726c..01e2119fd2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index b90fab3d55..e863edf3a3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index d80092098a..15e5264c8b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index f8b56d78a3..1645a3b64c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index a19d80f517..b0cb3cb803 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index b82b68a6d1..3326ac395c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 8bd126726c..01e2119fd2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index b90fab3d55..e863edf3a3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index d80092098a..15e5264c8b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index f8b56d78a3..1645a3b64c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index a19d80f517..b0cb3cb803 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index b82b68a6d1..3326ac395c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 8bd126726c..01e2119fd2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index b90fab3d55..e863edf3a3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index d80092098a..15e5264c8b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index f8b56d78a3..1645a3b64c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index a19d80f517..b0cb3cb803 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index b82b68a6d1..3326ac395c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 8bd126726c..01e2119fd2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index b90fab3d55..e863edf3a3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index d80092098a..15e5264c8b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index f8b56d78a3..1645a3b64c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index a19d80f517..b0cb3cb803 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index b82b68a6d1..3326ac395c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 8bd126726c..01e2119fd2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index b90fab3d55..e863edf3a3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index d80092098a..15e5264c8b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index f8b56d78a3..1645a3b64c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index a19d80f517..b0cb3cb803 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index b82b68a6d1..3326ac395c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 8bd126726c..01e2119fd2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index b90fab3d55..e863edf3a3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index d80092098a..15e5264c8b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index f8b56d78a3..1645a3b64c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index a19d80f517..b0cb3cb803 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index b82b68a6d1..3326ac395c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 8bd126726c..01e2119fd2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index b90fab3d55..e863edf3a3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index d80092098a..15e5264c8b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index f8b56d78a3..1645a3b64c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index a19d80f517..b0cb3cb803 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index b82b68a6d1..3326ac395c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 8bd126726c..01e2119fd2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index b90fab3d55..e863edf3a3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index d80092098a..15e5264c8b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index f8b56d78a3..1645a3b64c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index a19d80f517..b0cb3cb803 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index b82b68a6d1..3326ac395c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 8bd126726c..01e2119fd2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index b90fab3d55..e863edf3a3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index d80092098a..15e5264c8b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index f8b56d78a3..1645a3b64c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index a19d80f517..b0cb3cb803 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index b82b68a6d1..3326ac395c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 8bd126726c..01e2119fd2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index b90fab3d55..e863edf3a3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index d80092098a..15e5264c8b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -123,7 +123,7 @@ public final class EnergyAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index f8b56d78a3..1645a3b64c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -138,7 +138,7 @@ public final class PhysicalAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index a19d80f517..b0cb3cb803 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -100,7 +100,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index b82b68a6d1..3326ac395c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -111,7 +111,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 8bd126726c..01e2119fd2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -131,7 +131,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index b90fab3d55..e863edf3a3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -125,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect if (defence != -1) { // TODO: Find proper defence formula. - defence = effected.getLevel() > 99 ? defence / 10 : defence; + defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence; // Trait, elements final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);