lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Faster weapon base value calculation when not transformed.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-03-17 00:32:19 +00:00
parent 2d987325eb
commit 0daaf43bf7
19 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
View File

@ -65,7 +65,7 @@ public interface IStatFunction
default double calcWeaponBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPet())
{
final PetInstance pet = (PetInstance) creature;
@ -85,7 +85,7 @@ public interface IStatFunction
default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPlayable())
{

4
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
View File

@ -65,7 +65,7 @@ public interface IStatFunction
default double calcWeaponBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPet())
{
final PetInstance pet = (PetInstance) creature;
@ -85,7 +85,7 @@ public interface IStatFunction
default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPlayable())
{

4
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
View File

@ -65,7 +65,7 @@ public interface IStatFunction
default double calcWeaponBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPet())
{
final PetInstance pet = (PetInstance) creature;
@ -85,7 +85,7 @@ public interface IStatFunction
default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPlayable())
{

4
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
View File

@ -65,7 +65,7 @@ public interface IStatFunction
default double calcWeaponBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPet())
{
final PetInstance pet = (PetInstance) creature;
@ -85,7 +85,7 @@ public interface IStatFunction
default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPlayable())
{

4
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
View File

@ -65,7 +65,7 @@ public interface IStatFunction
default double calcWeaponBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPet())
{
final PetInstance pet = (PetInstance) creature;
@ -85,7 +85,7 @@ public interface IStatFunction
default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPlayable())
{

4
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
View File

@ -65,7 +65,7 @@ public interface IStatFunction
default double calcWeaponBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPet())
{
final PetInstance pet = (PetInstance) creature;
@ -85,7 +85,7 @@ public interface IStatFunction
default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPlayable())
{

4
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
View File

@ -65,7 +65,7 @@ public interface IStatFunction
default double calcWeaponBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPet())
{
final PetInstance pet = (PetInstance) creature;
@ -85,7 +85,7 @@ public interface IStatFunction
default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPlayable())
{

4
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
View File

@ -65,7 +65,7 @@ public interface IStatFunction
default double calcWeaponBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPet())
{
final PetInstance pet = (PetInstance) creature;
@ -85,7 +85,7 @@ public interface IStatFunction
default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPlayable())
{

4
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
View File

@ -65,7 +65,7 @@ public interface IStatFunction
default double calcWeaponBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPet())
{
final PetInstance pet = (PetInstance) creature;
@ -85,7 +85,7 @@ public interface IStatFunction
default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPlayable())
{

4
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
View File

@ -65,7 +65,7 @@ public interface IStatFunction
default double calcWeaponBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPet())
{
final PetInstance pet = (PetInstance) creature;
@ -85,7 +85,7 @@ public interface IStatFunction
default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPlayable())
{

4
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
View File

@ -65,7 +65,7 @@ public interface IStatFunction
default double calcWeaponBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPet())
{
final PetInstance pet = (PetInstance) creature;
@ -85,7 +85,7 @@ public interface IStatFunction
default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPlayable())
{

4
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
View File

@ -65,7 +65,7 @@ public interface IStatFunction
default double calcWeaponBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPet())
{
final PetInstance pet = (PetInstance) creature;
@ -85,7 +85,7 @@ public interface IStatFunction
default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPlayable())
{

4
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
View File

@ -65,7 +65,7 @@ public interface IStatFunction
default double calcWeaponBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPet())
{
final PetInstance pet = (PetInstance) creature;
@ -85,7 +85,7 @@ public interface IStatFunction
default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPlayable())
{

4
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
View File

@ -65,7 +65,7 @@ public interface IStatFunction
default double calcWeaponBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPet())
{
final PetInstance pet = (PetInstance) creature;
@ -85,7 +85,7 @@ public interface IStatFunction
default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPlayable())
{

4
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
View File

@ -65,7 +65,7 @@ public interface IStatFunction
default double calcWeaponBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPet())
{
final PetInstance pet = (PetInstance) creature;
@ -85,7 +85,7 @@ public interface IStatFunction
default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPlayable())
{

4
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
View File

@ -65,7 +65,7 @@ public interface IStatFunction
default double calcWeaponBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPet())
{
final PetInstance pet = (PetInstance) creature;
@ -85,7 +85,7 @@ public interface IStatFunction
default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPlayable())
{

4
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
View File

@ -65,7 +65,7 @@ public interface IStatFunction
default double calcWeaponBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPet())
{
final PetInstance pet = (PetInstance) creature;
@ -85,7 +85,7 @@ public interface IStatFunction
default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPlayable())
{

4
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
View File

@ -65,7 +65,7 @@ public interface IStatFunction
default double calcWeaponBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPet())
{
final PetInstance pet = (PetInstance) creature;
@ -85,7 +85,7 @@ public interface IStatFunction
default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPlayable())
{

4
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java
View File

@ -65,7 +65,7 @@ public interface IStatFunction
default double calcWeaponBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPet())
{
final PetInstance pet = (PetInstance) creature;
@ -85,7 +85,7 @@ public interface IStatFunction
default double calcWeaponPlusBaseValue(Creature creature, Stat stat)
{
final double baseTemplateValue = creature.getTemplate().getBaseValue(stat, 0);
double baseValue = creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue);
double baseValue = creature.isTransformed() ? creature.getTransformation().filter(transform -> !transform.isStance()).map(transform -> transform.getStats(creature, stat, baseTemplateValue)).orElse(baseTemplateValue) : baseTemplateValue;
if (creature.isPlayable())
{