From 745c66def2dba97e985104acafe367f3ead6829e Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 10 Nov 2015 09:11:38 +0000 Subject: [PATCH] Minor refactoring on previous commit. --- .../data/xml/impl/SkillTreesData.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/SkillTreesData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/SkillTreesData.java index 86eed294ea..f77d37a290 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/SkillTreesData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/SkillTreesData.java @@ -1518,17 +1518,16 @@ public final class SkillTreesData implements IXmlReader for (Skill skill : player.getAllSkills()) { final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId()); - final int Lvl_cur = skill.getLevel(); - final int hashCode = SkillData.getSkillHashCode(skill.getId(), maxLvl); - final int hash_cur = SkillData.getSkillHashCode(skill.getId(), Lvl_cur); // must in parent class - final int hash_curx = SkillData.getSkillHashCode(skill.getId(), Lvl_cur + 1); // some skill not update maxlvl in stats - - final int _classlv = player.getClassId().level(); - ClassId _classId = player.getClassId(); - for (int i = 0; i < _classlv; i++) + final int currentLevel = skill.getLevel(); + final int hashMaxLevel = SkillData.getSkillHashCode(skill.getId(), maxLvl); + final int hashCurrentLevel = SkillData.getSkillHashCode(skill.getId(), currentLevel); // must in parent class + final int hashNextLevel = SkillData.getSkillHashCode(skill.getId(), currentLevel + 1); // some skill not update maxlvl in stats + final int classlevel = player.getClassId().level(); + ClassId classId = player.getClassId(); + for (int i = 0; i < classlevel; i++) { - _classId = _classId.getParent(); - if (isCurrentClassSkillNoParent(_classId, hash_cur) && (!isCurrentClassSkillNoParent(player.getClassId(), hashCode) && !isCurrentClassSkillNoParent(player.getClassId(), hash_curx)) && !isRemoveSkill(player.getClassId(), skill.getId())) + classId = classId.getParent(); + if (isCurrentClassSkillNoParent(classId, hashCurrentLevel) && (!isCurrentClassSkillNoParent(player.getClassId(), hashMaxLevel) && !isCurrentClassSkillNoParent(player.getClassId(), hashNextLevel)) && !isRemoveSkill(player.getClassId(), skill.getId())) { player.removeSkill(skill, true, true); }