From 05978991926793c630e17b4fdddee0ae240afb24 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 12 Jan 2019 07:57:16 +0000
Subject: [PATCH] Fixed AbnormalShield effect related formulas.

---
 .../gameserver/model/stats/Formulas.java      | 24 +++++++------------
 .../gameserver/model/stats/Formulas.java      | 24 +++++++------------
 .../gameserver/model/stats/Formulas.java      | 24 +++++++------------
 .../gameserver/model/stats/Formulas.java      | 24 +++++++------------
 .../gameserver/model/stats/Formulas.java      | 24 +++++++------------
 .../gameserver/model/stats/Formulas.java      | 24 +++++++------------
 .../gameserver/model/stats/Formulas.java      | 24 +++++++------------
 .../gameserver/model/stats/Formulas.java      | 24 +++++++------------
 .../gameserver/model/stats/Formulas.java      | 24 +++++++------------
 .../gameserver/model/stats/Formulas.java      | 24 +++++++------------
 10 files changed, 90 insertions(+), 150 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index 7025e214b4..b770830ce9 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -595,10 +595,7 @@ public final class Formulas
 		{
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}
@@ -637,18 +634,18 @@ public final class Formulas
 			{
 				if (target.getAbnormalShieldBlocks() > 0)
 				{
-					if (target.decrementAbnormalShieldBlocks() == 0)
-					{
-						target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-					}
+					target.decrementAbnormalShieldBlocks();
 					resisted = true;
 				}
 			}
 			
-			final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
-			if (!resisted && (sphericBarrierRange > 0))
+			if (!resisted)
 			{
-				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)
@@ -704,10 +701,7 @@ public final class Formulas
 			
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index 7025e214b4..b770830ce9 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -595,10 +595,7 @@ public final class Formulas
 		{
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}
@@ -637,18 +634,18 @@ public final class Formulas
 			{
 				if (target.getAbnormalShieldBlocks() > 0)
 				{
-					if (target.decrementAbnormalShieldBlocks() == 0)
-					{
-						target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-					}
+					target.decrementAbnormalShieldBlocks();
 					resisted = true;
 				}
 			}
 			
-			final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
-			if (!resisted && (sphericBarrierRange > 0))
+			if (!resisted)
 			{
-				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)
@@ -704,10 +701,7 @@ public final class Formulas
 			
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index 7025e214b4..b770830ce9 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -595,10 +595,7 @@ public final class Formulas
 		{
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}
@@ -637,18 +634,18 @@ public final class Formulas
 			{
 				if (target.getAbnormalShieldBlocks() > 0)
 				{
-					if (target.decrementAbnormalShieldBlocks() == 0)
-					{
-						target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-					}
+					target.decrementAbnormalShieldBlocks();
 					resisted = true;
 				}
 			}
 			
-			final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
-			if (!resisted && (sphericBarrierRange > 0))
+			if (!resisted)
 			{
-				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)
@@ -704,10 +701,7 @@ public final class Formulas
 			
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index e6ffb8960c..3d4b426646 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -595,10 +595,7 @@ public final class Formulas
 		{
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}
@@ -637,18 +634,18 @@ public final class Formulas
 			{
 				if (target.getAbnormalShieldBlocks() > 0)
 				{
-					if (target.decrementAbnormalShieldBlocks() == 0)
-					{
-						target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-					}
+					target.decrementAbnormalShieldBlocks();
 					resisted = true;
 				}
 			}
 			
-			final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
-			if (!resisted && (sphericBarrierRange > 0))
+			if (!resisted)
 			{
-				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)
@@ -704,10 +701,7 @@ public final class Formulas
 			
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index e6ffb8960c..3d4b426646 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -595,10 +595,7 @@ public final class Formulas
 		{
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}
@@ -637,18 +634,18 @@ public final class Formulas
 			{
 				if (target.getAbnormalShieldBlocks() > 0)
 				{
-					if (target.decrementAbnormalShieldBlocks() == 0)
-					{
-						target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-					}
+					target.decrementAbnormalShieldBlocks();
 					resisted = true;
 				}
 			}
 			
-			final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
-			if (!resisted && (sphericBarrierRange > 0))
+			if (!resisted)
 			{
-				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)
@@ -704,10 +701,7 @@ public final class Formulas
 			
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index e6ffb8960c..3d4b426646 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -595,10 +595,7 @@ public final class Formulas
 		{
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}
@@ -637,18 +634,18 @@ public final class Formulas
 			{
 				if (target.getAbnormalShieldBlocks() > 0)
 				{
-					if (target.decrementAbnormalShieldBlocks() == 0)
-					{
-						target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-					}
+					target.decrementAbnormalShieldBlocks();
 					resisted = true;
 				}
 			}
 			
-			final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
-			if (!resisted && (sphericBarrierRange > 0))
+			if (!resisted)
 			{
-				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)
@@ -704,10 +701,7 @@ public final class Formulas
 			
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index 059f7b5837..c1f767f0fe 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -595,10 +595,7 @@ public final class Formulas
 		{
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}
@@ -637,18 +634,18 @@ public final class Formulas
 			{
 				if (target.getAbnormalShieldBlocks() > 0)
 				{
-					if (target.decrementAbnormalShieldBlocks() == 0)
-					{
-						target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-					}
+					target.decrementAbnormalShieldBlocks();
 					resisted = true;
 				}
 			}
 			
-			final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
-			if (!resisted && (sphericBarrierRange > 0))
+			if (!resisted)
 			{
-				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)
@@ -704,10 +701,7 @@ public final class Formulas
 			
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index 059f7b5837..c1f767f0fe 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -595,10 +595,7 @@ public final class Formulas
 		{
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}
@@ -637,18 +634,18 @@ public final class Formulas
 			{
 				if (target.getAbnormalShieldBlocks() > 0)
 				{
-					if (target.decrementAbnormalShieldBlocks() == 0)
-					{
-						target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-					}
+					target.decrementAbnormalShieldBlocks();
 					resisted = true;
 				}
 			}
 			
-			final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
-			if (!resisted && (sphericBarrierRange > 0))
+			if (!resisted)
 			{
-				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)
@@ -704,10 +701,7 @@ public final class Formulas
 			
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index 059f7b5837..c1f767f0fe 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -595,10 +595,7 @@ public final class Formulas
 		{
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}
@@ -637,18 +634,18 @@ public final class Formulas
 			{
 				if (target.getAbnormalShieldBlocks() > 0)
 				{
-					if (target.decrementAbnormalShieldBlocks() == 0)
-					{
-						target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-					}
+					target.decrementAbnormalShieldBlocks();
 					resisted = true;
 				}
 			}
 			
-			final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
-			if (!resisted && (sphericBarrierRange > 0))
+			if (!resisted)
 			{
-				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)
@@ -704,10 +701,7 @@ public final class Formulas
 			
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index 059f7b5837..c1f767f0fe 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -595,10 +595,7 @@ public final class Formulas
 		{
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}
@@ -637,18 +634,18 @@ public final class Formulas
 			{
 				if (target.getAbnormalShieldBlocks() > 0)
 				{
-					if (target.decrementAbnormalShieldBlocks() == 0)
-					{
-						target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-					}
+					target.decrementAbnormalShieldBlocks();
 					resisted = true;
 				}
 			}
 			
-			final double sphericBarrierRange = target.getStat().getValue(Stats.SPHERIC_BARRIER_RANGE, 0);
-			if (!resisted && (sphericBarrierRange > 0))
+			if (!resisted)
 			{
-				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)
@@ -704,10 +701,7 @@ public final class Formulas
 			
 			if (target.getAbnormalShieldBlocks() > 0)
 			{
-				if (target.decrementAbnormalShieldBlocks() == 0)
-				{
-					target.stopEffects(EffectFlag.ABNORMAL_SHIELD);
-				}
+				target.decrementAbnormalShieldBlocks();
 				return false;
 			}
 		}