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

Fixed AbnormalShield effect related formulas.

Browse Source
This commit is contained in:
MobiusDev
2019-01-12 07:57:16 +00:00
parent 89d8e11288
commit 0597899192
10 changed files with 90 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -595,10 +595,7 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }
@@ -637,18 +634,18 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
resisted = true; resisted = true;
} }
} }
final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0); if (!resisted)
if (!resisted && (sphericBarrierRange > 0))
{ {
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange; final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
if (sphericBarrierRange > 0)
{
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange;
}
} }
if (resisted) if (resisted)
@@ -704,10 +701,7 @@ public final class Formulas
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }

24
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -595,10 +595,7 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }
@@ -637,18 +634,18 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
resisted = true; resisted = true;
} }
} }
final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0); if (!resisted)
if (!resisted && (sphericBarrierRange > 0))
{ {
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange; final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
if (sphericBarrierRange > 0)
{
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange;
}
} }
if (resisted) if (resisted)
@@ -704,10 +701,7 @@ public final class Formulas
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }

24
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -595,10 +595,7 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }
@@ -637,18 +634,18 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
resisted = true; resisted = true;
} }
} }
final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0); if (!resisted)
if (!resisted && (sphericBarrierRange > 0))
{ {
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange; final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
if (sphericBarrierRange > 0)
{
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange;
}
} }
if (resisted) if (resisted)
@@ -704,10 +701,7 @@ public final class Formulas
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }

24
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -595,10 +595,7 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }
@@ -637,18 +634,18 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
resisted = true; resisted = true;
} }
} }
final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0); if (!resisted)
if (!resisted && (sphericBarrierRange > 0))
{ {
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange; final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
if (sphericBarrierRange > 0)
{
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange;
}
} }
if (resisted) if (resisted)
@@ -704,10 +701,7 @@ public final class Formulas
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }

24
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -595,10 +595,7 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }
@@ -637,18 +634,18 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
resisted = true; resisted = true;
} }
} }
final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0); if (!resisted)
if (!resisted && (sphericBarrierRange > 0))
{ {
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange; final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
if (sphericBarrierRange > 0)
{
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange;
}
} }
if (resisted) if (resisted)
@@ -704,10 +701,7 @@ public final class Formulas
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }

24
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -595,10 +595,7 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }
@@ -637,18 +634,18 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
resisted = true; resisted = true;
} }
} }
final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0); if (!resisted)
if (!resisted && (sphericBarrierRange > 0))
{ {
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange; final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
if (sphericBarrierRange > 0)
{
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange;
}
} }
if (resisted) if (resisted)
@@ -704,10 +701,7 @@ public final class Formulas
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }

24
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -595,10 +595,7 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }
@@ -637,18 +634,18 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
resisted = true; resisted = true;
} }
} }
final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0); if (!resisted)
if (!resisted && (sphericBarrierRange > 0))
{ {
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange; final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
if (sphericBarrierRange > 0)
{
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange;
}
} }
if (resisted) if (resisted)
@@ -704,10 +701,7 @@ public final class Formulas
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }

24
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -595,10 +595,7 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }
@@ -637,18 +634,18 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
resisted = true; resisted = true;
} }
} }
final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0); if (!resisted)
if (!resisted && (sphericBarrierRange > 0))
{ {
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange; final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
if (sphericBarrierRange > 0)
{
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange;
}
} }
if (resisted) if (resisted)
@@ -704,10 +701,7 @@ public final class Formulas
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }

24
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -595,10 +595,7 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }
@@ -637,18 +634,18 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
resisted = true; resisted = true;
} }
} }
final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0); if (!resisted)
if (!resisted && (sphericBarrierRange > 0))
{ {
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange; final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
if (sphericBarrierRange > 0)
{
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange;
}
} }
if (resisted) if (resisted)
@@ -704,10 +701,7 @@ public final class Formulas
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }

24
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -595,10 +595,7 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }
@@ -637,18 +634,18 @@ public final class Formulas
{ {
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
resisted = true; resisted = true;
} }
} }
final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0); if (!resisted)
if (!resisted && (sphericBarrierRange > 0))
{ {
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange; final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
if (sphericBarrierRange > 0)
{
resisted = attacker.calculateDistance3D(target) > sphericBarrierRange;
}
} }
if (resisted) if (resisted)
@@ -704,10 +701,7 @@ public final class Formulas
if (target.getAbnormalShieldBlocks() > 0) if (target.getAbnormalShieldBlocks() > 0)
{ {
if (target.decrementAbnormalShieldBlocks() == 0) target.decrementAbnormalShieldBlocks();
{
target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
}
return false; return false;
} }
} }