From 90ca2cc7e8e9577aa67368bd311c7855d869ef2b Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 15 Apr 2019 17:40:30 +0000 Subject: [PATCH] Proper MaxMpFinalizer initial value. --- .../gameserver/model/stats/finalizers/MaxMpFinalizer.java | 6 +++--- .../gameserver/model/stats/finalizers/MaxMpFinalizer.java | 6 +++--- .../gameserver/model/stats/finalizers/MaxMpFinalizer.java | 6 +++--- .../gameserver/model/stats/finalizers/MaxMpFinalizer.java | 6 +++--- .../gameserver/model/stats/finalizers/MaxMpFinalizer.java | 2 +- .../gameserver/model/stats/finalizers/MaxMpFinalizer.java | 6 +++--- .../gameserver/model/stats/finalizers/MaxMpFinalizer.java | 6 +++--- .../gameserver/model/stats/finalizers/MaxMpFinalizer.java | 6 +++--- .../gameserver/model/stats/finalizers/MaxMpFinalizer.java | 6 +++--- .../gameserver/model/stats/finalizers/MaxMpFinalizer.java | 6 +++--- .../gameserver/model/stats/finalizers/MaxMpFinalizer.java | 6 +++--- 11 files changed, 31 insertions(+), 31 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 093ece5e1c..e079b28c45 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction { throwIfPresent(base); - double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat)); + double baseValue = creature.getTemplate().getBaseValue(stat, 0); if (creature.isPet()) { final PetInstance pet = (PetInstance) creature; - baseValue += pet.getPetLevelData().getPetMaxMP(); + baseValue = pet.getPetLevelData().getPetMaxMP(); } else if (creature.isPlayer()) { final PlayerInstance player = creature.getActingPlayer(); if (player != null) { - baseValue += player.getTemplate().getBaseMpMax(player.getLevel()); + baseValue = player.getTemplate().getBaseMpMax(player.getLevel()); } } final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 093ece5e1c..e079b28c45 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction { throwIfPresent(base); - double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat)); + double baseValue = creature.getTemplate().getBaseValue(stat, 0); if (creature.isPet()) { final PetInstance pet = (PetInstance) creature; - baseValue += pet.getPetLevelData().getPetMaxMP(); + baseValue = pet.getPetLevelData().getPetMaxMP(); } else if (creature.isPlayer()) { final PlayerInstance player = creature.getActingPlayer(); if (player != null) { - baseValue += player.getTemplate().getBaseMpMax(player.getLevel()); + baseValue = player.getTemplate().getBaseMpMax(player.getLevel()); } } final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 093ece5e1c..e079b28c45 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction { throwIfPresent(base); - double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat)); + double baseValue = creature.getTemplate().getBaseValue(stat, 0); if (creature.isPet()) { final PetInstance pet = (PetInstance) creature; - baseValue += pet.getPetLevelData().getPetMaxMP(); + baseValue = pet.getPetLevelData().getPetMaxMP(); } else if (creature.isPlayer()) { final PlayerInstance player = creature.getActingPlayer(); if (player != null) { - baseValue += player.getTemplate().getBaseMpMax(player.getLevel()); + baseValue = player.getTemplate().getBaseMpMax(player.getLevel()); } } final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 093ece5e1c..e079b28c45 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction { throwIfPresent(base); - double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat)); + double baseValue = creature.getTemplate().getBaseValue(stat, 0); if (creature.isPet()) { final PetInstance pet = (PetInstance) creature; - baseValue += pet.getPetLevelData().getPetMaxMP(); + baseValue = pet.getPetLevelData().getPetMaxMP(); } else if (creature.isPlayer()) { final PlayerInstance player = creature.getActingPlayer(); if (player != null) { - baseValue += player.getTemplate().getBaseMpMax(player.getLevel()); + baseValue = player.getTemplate().getBaseMpMax(player.getLevel()); } } final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 093ece5e1c..88e265243d 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -35,7 +35,7 @@ public class MaxMpFinalizer implements IStatsFunction { throwIfPresent(base); - double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat)); + double baseValue = creature.getTemplate().getBaseValue(stat, 0); if (creature.isPet()) { final PetInstance pet = (PetInstance) creature; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 093ece5e1c..e079b28c45 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction { throwIfPresent(base); - double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat)); + double baseValue = creature.getTemplate().getBaseValue(stat, 0); if (creature.isPet()) { final PetInstance pet = (PetInstance) creature; - baseValue += pet.getPetLevelData().getPetMaxMP(); + baseValue = pet.getPetLevelData().getPetMaxMP(); } else if (creature.isPlayer()) { final PlayerInstance player = creature.getActingPlayer(); if (player != null) { - baseValue += player.getTemplate().getBaseMpMax(player.getLevel()); + baseValue = player.getTemplate().getBaseMpMax(player.getLevel()); } } final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 093ece5e1c..e079b28c45 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction { throwIfPresent(base); - double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat)); + double baseValue = creature.getTemplate().getBaseValue(stat, 0); if (creature.isPet()) { final PetInstance pet = (PetInstance) creature; - baseValue += pet.getPetLevelData().getPetMaxMP(); + baseValue = pet.getPetLevelData().getPetMaxMP(); } else if (creature.isPlayer()) { final PlayerInstance player = creature.getActingPlayer(); if (player != null) { - baseValue += player.getTemplate().getBaseMpMax(player.getLevel()); + baseValue = player.getTemplate().getBaseMpMax(player.getLevel()); } } final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 3b447aeef7..3420b34014 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction { throwIfPresent(base); - double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat)); + double baseValue = creature.getTemplate().getBaseValue(stat, 0); if (creature.isPet()) { final PetInstance pet = (PetInstance) creature; - baseValue += pet.getPetLevelData().getPetMaxMP(); + baseValue = pet.getPetLevelData().getPetMaxMP(); } else if (creature.isPlayer()) { final PlayerInstance player = creature.getActingPlayer(); if (player != null) { - baseValue += player.getTemplate().getBaseMpMax(player.getLevel()); + baseValue = player.getTemplate().getBaseMpMax(player.getLevel()); } } final double menBonus = creature.getMEN() > 0 ? BaseStats.MEN.calcBonus(creature) : 1.; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 3b447aeef7..3420b34014 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction { throwIfPresent(base); - double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat)); + double baseValue = creature.getTemplate().getBaseValue(stat, 0); if (creature.isPet()) { final PetInstance pet = (PetInstance) creature; - baseValue += pet.getPetLevelData().getPetMaxMP(); + baseValue = pet.getPetLevelData().getPetMaxMP(); } else if (creature.isPlayer()) { final PlayerInstance player = creature.getActingPlayer(); if (player != null) { - baseValue += player.getTemplate().getBaseMpMax(player.getLevel()); + baseValue = player.getTemplate().getBaseMpMax(player.getLevel()); } } final double menBonus = creature.getMEN() > 0 ? BaseStats.MEN.calcBonus(creature) : 1.; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 3b447aeef7..3420b34014 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction { throwIfPresent(base); - double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat)); + double baseValue = creature.getTemplate().getBaseValue(stat, 0); if (creature.isPet()) { final PetInstance pet = (PetInstance) creature; - baseValue += pet.getPetLevelData().getPetMaxMP(); + baseValue = pet.getPetLevelData().getPetMaxMP(); } else if (creature.isPlayer()) { final PlayerInstance player = creature.getActingPlayer(); if (player != null) { - baseValue += player.getTemplate().getBaseMpMax(player.getLevel()); + baseValue = player.getTemplate().getBaseMpMax(player.getLevel()); } } final double menBonus = creature.getMEN() > 0 ? BaseStats.MEN.calcBonus(creature) : 1.; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index 3b447aeef7..3420b34014 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction { throwIfPresent(base); - double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat)); + double baseValue = creature.getTemplate().getBaseValue(stat, 0); if (creature.isPet()) { final PetInstance pet = (PetInstance) creature; - baseValue += pet.getPetLevelData().getPetMaxMP(); + baseValue = pet.getPetLevelData().getPetMaxMP(); } else if (creature.isPlayer()) { final PlayerInstance player = creature.getActingPlayer(); if (player != null) { - baseValue += player.getTemplate().getBaseMpMax(player.getLevel()); + baseValue = player.getTemplate().getBaseMpMax(player.getLevel()); } } final double menBonus = creature.getMEN() > 0 ? BaseStats.MEN.calcBonus(creature) : 1.;