From d464c9bbe7cbc0109ba0754bb9a9956be91b3822 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 10 Apr 2018 15:14:11 +0000 Subject: [PATCH] Minor fix for decrease skill level. Contributed by facab. --- .../gameserver/model/actor/instance/L2PcInstance.java | 6 +++++- .../gameserver/model/actor/instance/L2PcInstance.java | 6 +++++- .../gameserver/model/actor/instance/L2PcInstance.java | 6 +++++- .../gameserver/model/actor/instance/L2PcInstance.java | 6 +++++- .../gameserver/model/actor/instance/L2PcInstance.java | 6 +++++- .../gameserver/model/actor/instance/L2PcInstance.java | 6 +++++- .../gameserver/model/actor/instance/L2PcInstance.java | 6 +++++- 7 files changed, 35 insertions(+), 7 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index a7a40e5461..2968b22f06 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -2508,7 +2508,11 @@ public final class L2PcInstance extends L2Playable giveAvailableAutoGetSkills(); } - checkPlayerSkills(); + if (Config.DECREASE_SKILL_LEVEL && !canOverrideCond(PcCondOverride.SKILL_CONDITIONS)) + { + checkPlayerSkills(); + } + checkItemRestriction(); sendSkillList(); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index c51767af1b..d746a2674c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -2514,7 +2514,11 @@ public final class L2PcInstance extends L2Playable giveAvailableAutoGetSkills(); } - checkPlayerSkills(); + if (Config.DECREASE_SKILL_LEVEL && !canOverrideCond(PcCondOverride.SKILL_CONDITIONS)) + { + checkPlayerSkills(); + } + checkItemRestriction(); sendSkillList(); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 0ac366429b..f4338c430c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -2516,7 +2516,11 @@ public final class L2PcInstance extends L2Playable giveAvailableAutoGetSkills(); } - checkPlayerSkills(); + if (Config.DECREASE_SKILL_LEVEL && !canOverrideCond(PcCondOverride.SKILL_CONDITIONS)) + { + checkPlayerSkills(); + } + checkItemRestriction(); sendSkillList(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 8b1c0e0e73..84a6a6f8cc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -2519,7 +2519,11 @@ public final class L2PcInstance extends L2Playable giveAvailableAutoGetSkills(); } - checkPlayerSkills(); + if (Config.DECREASE_SKILL_LEVEL && !canOverrideCond(PcCondOverride.SKILL_CONDITIONS)) + { + checkPlayerSkills(); + } + checkItemRestriction(); sendSkillList(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 048be11d80..b79c819b85 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -2497,7 +2497,11 @@ public final class L2PcInstance extends L2Playable giveAvailableAutoGetSkills(); } - checkPlayerSkills(); + if (Config.DECREASE_SKILL_LEVEL && !canOverrideCond(PcCondOverride.SKILL_CONDITIONS)) + { + checkPlayerSkills(); + } + checkItemRestriction(); sendSkillList(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 6641d786fd..44f654a922 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -2490,7 +2490,11 @@ public final class L2PcInstance extends L2Playable giveAvailableAutoGetSkills(); } - checkPlayerSkills(); + if (Config.DECREASE_SKILL_LEVEL && !canOverrideCond(PcCondOverride.SKILL_CONDITIONS)) + { + checkPlayerSkills(); + } + checkItemRestriction(); sendSkillList(); } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 7d583443fd..0b621c12b6 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -2490,7 +2490,11 @@ public final class L2PcInstance extends L2Playable giveAvailableAutoGetSkills(); } - checkPlayerSkills(); + if (Config.DECREASE_SKILL_LEVEL && !canOverrideCond(PcCondOverride.SKILL_CONDITIONS)) + { + checkPlayerSkills(); + } + checkItemRestriction(); sendSkillList(); }