From cf4371bb978fa95f531084c3d5d7a9dbe4e2eb6d Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 20 Jun 2020 22:57:06 +0000 Subject: [PATCH] Fixed Divine Inspiration auto learned while it should not. Contributed by Sahar. --- .../gameserver/model/actor/instance/PlayerInstance.java | 5 +++++ .../gameserver/model/actor/instance/PlayerInstance.java | 5 +++++ .../gameserver/model/actor/instance/PlayerInstance.java | 5 +++++ .../gameserver/model/actor/instance/PlayerInstance.java | 5 +++++ .../gameserver/model/actor/instance/PlayerInstance.java | 5 +++++ .../gameserver/model/actor/instance/PlayerInstance.java | 5 +++++ .../gameserver/model/actor/instance/PlayerInstance.java | 7 ++++++- .../gameserver/model/actor/instance/PlayerInstance.java | 7 ++++++- .../gameserver/model/actor/instance/PlayerInstance.java | 5 +++++ .../gameserver/model/actor/instance/PlayerInstance.java | 5 +++++ .../gameserver/model/actor/instance/PlayerInstance.java | 5 +++++ .../gameserver/model/actor/instance/PlayerInstance.java | 5 +++++ .../gameserver/model/actor/instance/PlayerInstance.java | 5 +++++ .../gameserver/model/actor/instance/PlayerInstance.java | 5 +++++ .../gameserver/model/actor/instance/PlayerInstance.java | 5 +++++ 15 files changed, 77 insertions(+), 2 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 65643c990c..02ea20b5b7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -9514,6 +9514,11 @@ public class PlayerInstance extends Playable final Map prevSkillList = new HashMap<>(); for (SkillLearn skillInfo : skillTree.values()) { + if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION) + { + continue; + } + if (skillInfo.getGetLevel() <= newClass.getLevel()) { final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId()); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index ad0c8c96f8..72a9e2f927 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -9521,6 +9521,11 @@ public class PlayerInstance extends Playable final Map prevSkillList = new HashMap<>(); for (SkillLearn skillInfo : skillTree.values()) { + if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION) + { + continue; + } + if (skillInfo.getGetLevel() <= newClass.getLevel()) { final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId()); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index c94a9b85f9..45612a4e00 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -9523,6 +9523,11 @@ public class PlayerInstance extends Playable final Map prevSkillList = new HashMap<>(); for (SkillLearn skillInfo : skillTree.values()) { + if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION) + { + continue; + } + if (skillInfo.getGetLevel() <= newClass.getLevel()) { final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index cb9be0af04..ec06545d3c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -9514,6 +9514,11 @@ public class PlayerInstance extends Playable final Map prevSkillList = new HashMap<>(); for (SkillLearn skillInfo : skillTree.values()) { + if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION) + { + continue; + } + if (skillInfo.getGetLevel() <= newClass.getLevel()) { final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId()); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index e743b36cc8..47a841958d 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -9501,6 +9501,11 @@ public class PlayerInstance extends Playable final Map prevSkillList = new HashMap<>(); for (SkillLearn skillInfo : skillTree.values()) { + if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION) + { + continue; + } + if (skillInfo.getGetLevel() <= newClass.getLevel()) { final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId()); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 896d891172..3af4ac96b6 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -9501,6 +9501,11 @@ public class PlayerInstance extends Playable final Map prevSkillList = new HashMap<>(); for (SkillLearn skillInfo : skillTree.values()) { + if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION) + { + continue; + } + if (skillInfo.getGetLevel() <= newClass.getLevel()) { final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId()); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 961e380501..71a12ae14c 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -9502,7 +9502,12 @@ public class PlayerInstance extends Playable final Map prevSkillList = new HashMap<>(); for (SkillLearn skillInfo : skillTree.values()) { - if (!Config.AUTO_LEARN_FP_SKILLS && (skillInfo.getSkillId() > 11399) && (skillInfo.getSkillId() < 11405)) + if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION) + { + continue; + } + + if ((skillInfo.getSkillId() > 11399) && (skillInfo.getSkillId() < 11405) && !Config.AUTO_LEARN_FP_SKILLS) { continue; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index a66a458a38..3ee7426c82 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -9483,7 +9483,12 @@ public class PlayerInstance extends Playable final Map prevSkillList = new HashMap<>(); for (SkillLearn skillInfo : skillTree.values()) { - if (!Config.AUTO_LEARN_FP_SKILLS && (skillInfo.getSkillId() > 11399) && (skillInfo.getSkillId() < 11405)) + if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION) + { + continue; + } + + if ((skillInfo.getSkillId() > 11399) && (skillInfo.getSkillId() < 11405) && !Config.AUTO_LEARN_FP_SKILLS) { continue; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 04a0018499..e3d487dead 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -9455,6 +9455,11 @@ public class PlayerInstance extends Playable final Map prevSkillList = new HashMap<>(); for (SkillLearn skillInfo : skillTree.values()) { + if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION) + { + continue; + } + if (skillInfo.getGetLevel() <= newClass.getLevel()) { final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 8c78acbcd2..d80c7751b6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -9455,6 +9455,11 @@ public class PlayerInstance extends Playable final Map prevSkillList = new HashMap<>(); for (SkillLearn skillInfo : skillTree.values()) { + if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION) + { + continue; + } + if (skillInfo.getGetLevel() <= newClass.getLevel()) { final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 779b0993ac..5457c0f809 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -9441,6 +9441,11 @@ public class PlayerInstance extends Playable final Map prevSkillList = new HashMap<>(); for (SkillLearn skillInfo : skillTree.values()) { + if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION) + { + continue; + } + if (skillInfo.getGetLevel() <= newClass.getLevel()) { final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 2ee6be2148..86921ea902 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -9468,6 +9468,11 @@ public class PlayerInstance extends Playable final Map prevSkillList = new HashMap<>(); for (SkillLearn skillInfo : skillTree.values()) { + if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION) + { + continue; + } + if (skillInfo.getGetLevel() <= newClass.getLevel()) { final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 309af9e63f..62f736f83d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -9468,6 +9468,11 @@ public class PlayerInstance extends Playable final Map prevSkillList = new HashMap<>(); for (SkillLearn skillInfo : skillTree.values()) { + if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION) + { + continue; + } + if (skillInfo.getGetLevel() <= newClass.getLevel()) { final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 42f908443a..56735806cc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -9385,6 +9385,11 @@ public class PlayerInstance extends Playable final Map prevSkillList = new HashMap<>(); for (SkillLearn skillInfo : skillTree.values()) { + if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION) + { + continue; + } + if (skillInfo.getGetLevel() <= newClass.getLevel()) { final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index f0298c080d..7c5044444e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -9467,6 +9467,11 @@ public class PlayerInstance extends Playable final Map prevSkillList = new HashMap<>(); for (SkillLearn skillInfo : skillTree.values()) { + if ((skillInfo.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION) + { + continue; + } + if (skillInfo.getGetLevel() <= newClass.getLevel()) { final Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());