From d16cc9290fa26b4f26fb48339658da8a6d7d032f Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 26 Apr 2018 09:38:37 +0000 Subject: [PATCH] Reduce player HP should use ignoreCP parameter. --- .../com/l2jmobius/gameserver/model/actor/L2Character.java | 4 ++++ .../com/l2jmobius/gameserver/model/actor/L2Character.java | 4 ++++ .../com/l2jmobius/gameserver/model/actor/L2Character.java | 4 ++++ .../com/l2jmobius/gameserver/model/actor/L2Character.java | 4 ++++ .../com/l2jmobius/gameserver/model/actor/L2Character.java | 4 ++++ .../com/l2jmobius/gameserver/model/actor/L2Character.java | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java index c9ad1dcf42..4bc314746c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -4489,6 +4489,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { getStatus().reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } + else if (isPlayer()) + { + getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp); + } else { getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java index c9ad1dcf42..4bc314746c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -4489,6 +4489,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { getStatus().reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } + else if (isPlayer()) + { + getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp); + } else { getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java index c9ad1dcf42..4bc314746c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -4489,6 +4489,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { getStatus().reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } + else if (isPlayer()) + { + getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp); + } else { getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java index c9ad1dcf42..4bc314746c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -4489,6 +4489,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { getStatus().reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } + else if (isPlayer()) + { + getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp); + } else { getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java index c9ad1dcf42..4bc314746c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -4489,6 +4489,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { getStatus().reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } + else if (isPlayer()) + { + getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp); + } else { getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java index c9ad1dcf42..4bc314746c 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -4489,6 +4489,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { getStatus().reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false); } + else if (isPlayer()) + { + getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp); + } else { getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);