From 906cb678c7af211d54d22bf84e0d948b21ee87c1 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 10 Sep 2017 00:07:41 +0000 Subject: [PATCH] Fixed stance skills reducing player attack stats. --- .../com/l2jmobius/gameserver/model/stats/IStatsFunction.java | 4 ++-- .../com/l2jmobius/gameserver/model/stats/IStatsFunction.java | 4 ++-- .../com/l2jmobius/gameserver/model/stats/IStatsFunction.java | 4 ++-- .../com/l2jmobius/gameserver/model/stats/IStatsFunction.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java index ffc74d6210..c819cff137 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java @@ -63,7 +63,7 @@ public interface IStatsFunction default double calcWeaponBaseValue(L2Character creature, Stats stat) { final double baseTemplateBalue = creature.getTemplate().getBaseValue(stat, 0); - final double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateBalue)).orElseGet(() -> + final double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateBalue)).orElseGet(() -> { if (creature.isPet()) { @@ -87,7 +87,7 @@ public interface IStatsFunction default double calcWeaponPlusBaseValue(L2Character creature, Stats stat) { final double baseTemplateBalue = creature.getTemplate().getBaseValue(stat, 0); - double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateBalue)).orElse(baseTemplateBalue); + double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateBalue)).orElse(baseTemplateBalue); if (creature.isPlayable()) { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java index ffc74d6210..c819cff137 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java @@ -63,7 +63,7 @@ public interface IStatsFunction default double calcWeaponBaseValue(L2Character creature, Stats stat) { final double baseTemplateBalue = creature.getTemplate().getBaseValue(stat, 0); - final double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateBalue)).orElseGet(() -> + final double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateBalue)).orElseGet(() -> { if (creature.isPet()) { @@ -87,7 +87,7 @@ public interface IStatsFunction default double calcWeaponPlusBaseValue(L2Character creature, Stats stat) { final double baseTemplateBalue = creature.getTemplate().getBaseValue(stat, 0); - double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateBalue)).orElse(baseTemplateBalue); + double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateBalue)).orElse(baseTemplateBalue); if (creature.isPlayable()) { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java index ffc74d6210..c819cff137 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java @@ -63,7 +63,7 @@ public interface IStatsFunction default double calcWeaponBaseValue(L2Character creature, Stats stat) { final double baseTemplateBalue = creature.getTemplate().getBaseValue(stat, 0); - final double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateBalue)).orElseGet(() -> + final double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateBalue)).orElseGet(() -> { if (creature.isPet()) { @@ -87,7 +87,7 @@ public interface IStatsFunction default double calcWeaponPlusBaseValue(L2Character creature, Stats stat) { final double baseTemplateBalue = creature.getTemplate().getBaseValue(stat, 0); - double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateBalue)).orElse(baseTemplateBalue); + double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateBalue)).orElse(baseTemplateBalue); if (creature.isPlayable()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java index ffc74d6210..c819cff137 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java @@ -63,7 +63,7 @@ public interface IStatsFunction default double calcWeaponBaseValue(L2Character creature, Stats stat) { final double baseTemplateBalue = creature.getTemplate().getBaseValue(stat, 0); - final double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateBalue)).orElseGet(() -> + final double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateBalue)).orElseGet(() -> { if (creature.isPet()) { @@ -87,7 +87,7 @@ public interface IStatsFunction default double calcWeaponPlusBaseValue(L2Character creature, Stats stat) { final double baseTemplateBalue = creature.getTemplate().getBaseValue(stat, 0); - double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateBalue)).orElse(baseTemplateBalue); + double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateBalue)).orElse(baseTemplateBalue); if (creature.isPlayable()) {