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

Removed usage of steam to check abnormals on effects.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-07-27 23:53:10 +00:00
parent 878c127047
commit c0d6a5e579
42 changed files with 588 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}

11
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java vendored
View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power;
// Check if we apply an abnormal modifier
if (_abnormals.stream().anyMatch(effected::hasAbnormalType))
// Check if we apply an abnormal modifier.
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
}
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

19
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormalSlot.java vendored
View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType))
if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{
return;
}