diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java index c463f58381..9578e54660 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java @@ -42,9 +42,10 @@ public class BaseStatsFinalizer implements IStatsFunction // Apply template value double baseValue = creature.getTemplate().getBaseValue(stat, 0); - final L2PcInstance player = creature.getActingPlayer(); - if (player != null) + // Should not apply armor set and henna bonus to summons. + if (creature.isPlayer()) { + final L2PcInstance player = creature.getActingPlayer(); final Set appliedSets = new HashSet<>(2); // Armor sets calculation diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java index c463f58381..9578e54660 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java @@ -42,9 +42,10 @@ public class BaseStatsFinalizer implements IStatsFunction // Apply template value double baseValue = creature.getTemplate().getBaseValue(stat, 0); - final L2PcInstance player = creature.getActingPlayer(); - if (player != null) + // Should not apply armor set and henna bonus to summons. + if (creature.isPlayer()) { + final L2PcInstance player = creature.getActingPlayer(); final Set appliedSets = new HashSet<>(2); // Armor sets calculation diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java index c463f58381..9578e54660 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java @@ -42,9 +42,10 @@ public class BaseStatsFinalizer implements IStatsFunction // Apply template value double baseValue = creature.getTemplate().getBaseValue(stat, 0); - final L2PcInstance player = creature.getActingPlayer(); - if (player != null) + // Should not apply armor set and henna bonus to summons. + if (creature.isPlayer()) { + final L2PcInstance player = creature.getActingPlayer(); final Set appliedSets = new HashSet<>(2); // Armor sets calculation diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java index c463f58381..9578e54660 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java @@ -42,9 +42,10 @@ public class BaseStatsFinalizer implements IStatsFunction // Apply template value double baseValue = creature.getTemplate().getBaseValue(stat, 0); - final L2PcInstance player = creature.getActingPlayer(); - if (player != null) + // Should not apply armor set and henna bonus to summons. + if (creature.isPlayer()) { + final L2PcInstance player = creature.getActingPlayer(); final Set appliedSets = new HashSet<>(2); // Armor sets calculation diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java index c463f58381..9578e54660 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java @@ -42,9 +42,10 @@ public class BaseStatsFinalizer implements IStatsFunction // Apply template value double baseValue = creature.getTemplate().getBaseValue(stat, 0); - final L2PcInstance player = creature.getActingPlayer(); - if (player != null) + // Should not apply armor set and henna bonus to summons. + if (creature.isPlayer()) { + final L2PcInstance player = creature.getActingPlayer(); final Set appliedSets = new HashSet<>(2); // Armor sets calculation diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java index c463f58381..9578e54660 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java @@ -42,9 +42,10 @@ public class BaseStatsFinalizer implements IStatsFunction // Apply template value double baseValue = creature.getTemplate().getBaseValue(stat, 0); - final L2PcInstance player = creature.getActingPlayer(); - if (player != null) + // Should not apply armor set and henna bonus to summons. + if (creature.isPlayer()) { + final L2PcInstance player = creature.getActingPlayer(); final Set appliedSets = new HashSet<>(2); // Armor sets calculation diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncArmorSet.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncArmorSet.java index c6e984801d..d01c3b186d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncArmorSet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncArmorSet.java @@ -53,9 +53,10 @@ public class FuncArmorSet extends AbstractFunction public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) { double value = initVal; - final L2PcInstance player = effector.getActingPlayer(); - if (player != null) + // Should not apply armor set bonus to summons. + if (effector.isPlayer()) { + final L2PcInstance player = effector.getActingPlayer(); final L2ItemInstance chest = player.getChestArmorInstance(); if (chest != null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncHenna.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncHenna.java index c1e1e21c20..a173dcc1f4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncHenna.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncHenna.java @@ -49,10 +49,11 @@ public class FuncHenna extends AbstractFunction @Override public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) { - final L2PcInstance pc = effector.getActingPlayer(); double value = initVal; - if (pc != null) + // Should not apply henna bonus to summons. + if (effector.isPlayer()) { + final L2PcInstance pc = effector.getActingPlayer(); switch (getStat()) { case STAT_STR: diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java index c463f58381..9578e54660 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java @@ -42,9 +42,10 @@ public class BaseStatsFinalizer implements IStatsFunction // Apply template value double baseValue = creature.getTemplate().getBaseValue(stat, 0); - final L2PcInstance player = creature.getActingPlayer(); - if (player != null) + // Should not apply armor set and henna bonus to summons. + if (creature.isPlayer()) { + final L2PcInstance player = creature.getActingPlayer(); final Set appliedSets = new HashSet<>(2); // Armor sets calculation diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java index c463f58381..9578e54660 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java @@ -42,9 +42,10 @@ public class BaseStatsFinalizer implements IStatsFunction // Apply template value double baseValue = creature.getTemplate().getBaseValue(stat, 0); - final L2PcInstance player = creature.getActingPlayer(); - if (player != null) + // Should not apply armor set and henna bonus to summons. + if (creature.isPlayer()) { + final L2PcInstance player = creature.getActingPlayer(); final Set appliedSets = new HashSet<>(2); // Armor sets calculation diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java index c463f58381..9578e54660 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java @@ -42,9 +42,10 @@ public class BaseStatsFinalizer implements IStatsFunction // Apply template value double baseValue = creature.getTemplate().getBaseValue(stat, 0); - final L2PcInstance player = creature.getActingPlayer(); - if (player != null) + // Should not apply armor set and henna bonus to summons. + if (creature.isPlayer()) { + final L2PcInstance player = creature.getActingPlayer(); final Set appliedSets = new HashSet<>(2); // Armor sets calculation diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java index c463f58381..9578e54660 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/finalizers/BaseStatsFinalizer.java @@ -42,9 +42,10 @@ public class BaseStatsFinalizer implements IStatsFunction // Apply template value double baseValue = creature.getTemplate().getBaseValue(stat, 0); - final L2PcInstance player = creature.getActingPlayer(); - if (player != null) + // Should not apply armor set and henna bonus to summons. + if (creature.isPlayer()) { + final L2PcInstance player = creature.getActingPlayer(); final Set appliedSets = new HashSet<>(2); // Armor sets calculation