From 63435873cfeb2d7240e51f14bdf4c0fa95e37a60 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 30 Mar 2019 04:45:05 +0000
Subject: [PATCH] PAttack and MAttack finalizer simplifications.

---
 .../gameserver/model/stats/finalizers/MAttackFinalizer.java  | 5 ++---
 .../gameserver/model/stats/finalizers/PAttackFinalizer.java  | 3 +--
 .../gameserver/model/stats/finalizers/MAttackFinalizer.java  | 5 ++---
 .../gameserver/model/stats/finalizers/PAttackFinalizer.java  | 3 +--
 .../gameserver/model/stats/finalizers/MAttackFinalizer.java  | 5 ++---
 .../gameserver/model/stats/finalizers/PAttackFinalizer.java  | 3 +--
 .../gameserver/model/stats/finalizers/MAttackFinalizer.java  | 5 ++---
 .../gameserver/model/stats/finalizers/PAttackFinalizer.java  | 3 +--
 .../gameserver/model/stats/finalizers/MAttackFinalizer.java  | 5 ++---
 .../gameserver/model/stats/finalizers/PAttackFinalizer.java  | 3 +--
 .../gameserver/model/stats/finalizers/MAttackFinalizer.java  | 5 ++---
 .../gameserver/model/stats/finalizers/PAttackFinalizer.java  | 3 +--
 .../gameserver/model/stats/finalizers/MAttackFinalizer.java  | 5 ++---
 .../gameserver/model/stats/finalizers/PAttackFinalizer.java  | 3 +--
 .../gameserver/model/stats/finalizers/MAttackFinalizer.java  | 3 +--
 .../gameserver/model/stats/finalizers/PAttackFinalizer.java  | 3 +--
 .../gameserver/model/stats/finalizers/MAttackFinalizer.java  | 3 +--
 .../gameserver/model/stats/finalizers/PAttackFinalizer.java  | 3 +--
 .../gameserver/model/stats/finalizers/MAttackFinalizer.java  | 3 +--
 .../gameserver/model/stats/finalizers/PAttackFinalizer.java  | 3 +--
 .../gameserver/model/stats/finalizers/MAttackFinalizer.java  | 3 +--
 .../gameserver/model/stats/finalizers/PAttackFinalizer.java  | 3 +--
 22 files changed, 29 insertions(+), 51 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 41ab04de9c..632823f5d2 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -53,9 +53,8 @@ public class MAttackFinalizer implements IStatsFunction
 		}
 		
 		// Calculate modifiers Magic Attack
-		final double chaMod = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
-		final double intBonus = BaseStats.INT.calcBonus(creature);
-		baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2) * chaMod;
+		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
+		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2) * chaBonus;
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index 8d476eb63f..4dd476b168 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -53,8 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
 			baseValue *= Config.RAID_PATTACK_MULTIPLIER;
 		}
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
-		final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.;
-		baseValue *= strBonus * creature.getLevelMod() * chaBonus;
+		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 41ab04de9c..632823f5d2 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -53,9 +53,8 @@ public class MAttackFinalizer implements IStatsFunction
 		}
 		
 		// Calculate modifiers Magic Attack
-		final double chaMod = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
-		final double intBonus = BaseStats.INT.calcBonus(creature);
-		baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2) * chaMod;
+		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
+		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2) * chaBonus;
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index 8d476eb63f..4dd476b168 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -53,8 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
 			baseValue *= Config.RAID_PATTACK_MULTIPLIER;
 		}
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
-		final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.;
-		baseValue *= strBonus * creature.getLevelMod() * chaBonus;
+		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 41ab04de9c..632823f5d2 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -53,9 +53,8 @@ public class MAttackFinalizer implements IStatsFunction
 		}
 		
 		// Calculate modifiers Magic Attack
-		final double chaMod = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
-		final double intBonus = BaseStats.INT.calcBonus(creature);
-		baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2) * chaMod;
+		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
+		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2) * chaBonus;
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index 8d476eb63f..4dd476b168 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -53,8 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
 			baseValue *= Config.RAID_PATTACK_MULTIPLIER;
 		}
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
-		final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.;
-		baseValue *= strBonus * creature.getLevelMod() * chaBonus;
+		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 41ab04de9c..632823f5d2 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -53,9 +53,8 @@ public class MAttackFinalizer implements IStatsFunction
 		}
 		
 		// Calculate modifiers Magic Attack
-		final double chaMod = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
-		final double intBonus = BaseStats.INT.calcBonus(creature);
-		baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2) * chaMod;
+		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
+		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2) * chaBonus;
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index 8d476eb63f..4dd476b168 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -53,8 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
 			baseValue *= Config.RAID_PATTACK_MULTIPLIER;
 		}
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
-		final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.;
-		baseValue *= strBonus * creature.getLevelMod() * chaBonus;
+		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 41ab04de9c..632823f5d2 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -53,9 +53,8 @@ public class MAttackFinalizer implements IStatsFunction
 		}
 		
 		// Calculate modifiers Magic Attack
-		final double chaMod = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
-		final double intBonus = BaseStats.INT.calcBonus(creature);
-		baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2) * chaMod;
+		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
+		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2) * chaBonus;
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index 8d476eb63f..4dd476b168 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -53,8 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
 			baseValue *= Config.RAID_PATTACK_MULTIPLIER;
 		}
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
-		final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.;
-		baseValue *= strBonus * creature.getLevelMod() * chaBonus;
+		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 41ab04de9c..632823f5d2 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -53,9 +53,8 @@ public class MAttackFinalizer implements IStatsFunction
 		}
 		
 		// Calculate modifiers Magic Attack
-		final double chaMod = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
-		final double intBonus = BaseStats.INT.calcBonus(creature);
-		baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2) * chaMod;
+		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
+		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2) * chaBonus;
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index 8d476eb63f..4dd476b168 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -53,8 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
 			baseValue *= Config.RAID_PATTACK_MULTIPLIER;
 		}
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
-		final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.;
-		baseValue *= strBonus * creature.getLevelMod() * chaBonus;
+		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 41ab04de9c..632823f5d2 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -53,9 +53,8 @@ public class MAttackFinalizer implements IStatsFunction
 		}
 		
 		// Calculate modifiers Magic Attack
-		final double chaMod = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
-		final double intBonus = BaseStats.INT.calcBonus(creature);
-		baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2) * chaMod;
+		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
+		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2) * chaBonus;
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index 8d476eb63f..4dd476b168 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -53,8 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
 			baseValue *= Config.RAID_PATTACK_MULTIPLIER;
 		}
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
-		final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.;
-		baseValue *= strBonus * creature.getLevelMod() * chaBonus;
+		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 0250e12aeb..8ecff8343b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -53,8 +53,7 @@ public class MAttackFinalizer implements IStatsFunction
 		}
 		
 		// Calculate modifiers Magic Attack
-		final double intBonus = BaseStats.INT.calcBonus(creature);
-		baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2);
+		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2);
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index e85d24f716..b34caca1e5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -52,8 +52,7 @@ public class PAttackFinalizer implements IStatsFunction
 		{
 			baseValue *= Config.RAID_PATTACK_MULTIPLIER;
 		}
-		final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.;
-		baseValue *= strBonus * creature.getLevelMod();
+		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod();
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 0250e12aeb..8ecff8343b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -53,8 +53,7 @@ public class MAttackFinalizer implements IStatsFunction
 		}
 		
 		// Calculate modifiers Magic Attack
-		final double intBonus = BaseStats.INT.calcBonus(creature);
-		baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2);
+		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2);
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index e85d24f716..b34caca1e5 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -52,8 +52,7 @@ public class PAttackFinalizer implements IStatsFunction
 		{
 			baseValue *= Config.RAID_PATTACK_MULTIPLIER;
 		}
-		final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.;
-		baseValue *= strBonus * creature.getLevelMod();
+		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod();
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 0250e12aeb..8ecff8343b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -53,8 +53,7 @@ public class MAttackFinalizer implements IStatsFunction
 		}
 		
 		// Calculate modifiers Magic Attack
-		final double intBonus = BaseStats.INT.calcBonus(creature);
-		baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2);
+		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2);
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index e85d24f716..b34caca1e5 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -52,8 +52,7 @@ public class PAttackFinalizer implements IStatsFunction
 		{
 			baseValue *= Config.RAID_PATTACK_MULTIPLIER;
 		}
-		final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.;
-		baseValue *= strBonus * creature.getLevelMod();
+		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod();
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 0250e12aeb..8ecff8343b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -53,8 +53,7 @@ public class MAttackFinalizer implements IStatsFunction
 		}
 		
 		// Calculate modifiers Magic Attack
-		final double intBonus = BaseStats.INT.calcBonus(creature);
-		baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2);
+		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2);
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index e85d24f716..b34caca1e5 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -52,8 +52,7 @@ public class PAttackFinalizer implements IStatsFunction
 		{
 			baseValue *= Config.RAID_PATTACK_MULTIPLIER;
 		}
-		final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.;
-		baseValue *= strBonus * creature.getLevelMod();
+		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod();
 		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
 	}