diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java index d621903662..4c110ea507 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -4514,11 +4514,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100; } else { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100; } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java index d621903662..4c110ea507 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -4514,11 +4514,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100; } else { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100; } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java index a681db4b6a..880e837ae3 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -4514,11 +4514,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100; } else { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java index a681db4b6a..880e837ae3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -4514,11 +4514,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100; } else { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100; } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8989e21d23..af232b4bab 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -4514,20 +4514,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100; } else { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100; } if (attacker.isRaid() || attacker.isRaidMinion()) { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100; } else if (attacker.isMonster()) { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100; } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8989e21d23..af232b4bab 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -4514,20 +4514,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100; } else { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100; } if (attacker.isRaid() || attacker.isRaidMinion()) { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100; } else if (attacker.isMonster()) { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100; } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8989e21d23..af232b4bab 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -4514,20 +4514,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100; } else { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100; } if (attacker.isRaid() || attacker.isRaidMinion()) { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100; } else if (attacker.isMonster()) { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100; } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java index 814422ee11..c4fe3c9658 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -4513,20 +4513,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100; } else { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100; } if (attacker.isRaid() || attacker.isRaidMinion()) { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100; } else if (attacker.isMonster()) { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java index e708c27926..3a7ec53443 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -4512,11 +4512,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100; } else { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java index e708c27926..3a7ec53443 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -4512,11 +4512,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100; } else { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java index 5cb3a39a68..3de090507b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -4512,20 +4512,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100; } else { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100; } if (attacker.isRaid() || attacker.isRaidMinion()) { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100; } else if (attacker.isMonster()) { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java index 4b521918b4..be4e018403 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -4521,20 +4521,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100; } else { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100; } if (attacker.isRaid() || attacker.isRaidMinion()) { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100; } else if (attacker.isMonster()) { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100; } elementalDamage = Formulas.calcSpiritElementalDamage(attacker, this, value); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java index 4b521918b4..be4e018403 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -4521,20 +4521,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100; } else { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100; } if (attacker.isRaid() || attacker.isRaidMinion()) { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100; } else if (attacker.isMonster()) { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100; } elementalDamage = Formulas.calcSpiritElementalDamage(attacker, this, value); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java index 9dd85e7215..d0ac062591 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -4520,20 +4520,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100; } else { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100; } if (attacker.isRaid() || attacker.isRaidMinion()) { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100; } else if (attacker.isMonster()) { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100; } elementalDamage = Formulas.calcSpiritElementalDamage(attacker, this, value); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index e708c27926..3a7ec53443 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -4512,11 +4512,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe { if (attacker.isPlayable()) { - value *= (100 + _stat.getValue(Stat.PVP_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100; } else { - value *= (100 + _stat.getValue(Stat.PVE_DAMAGE_TAKEN)) / 100; + value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100; } }