Enabled skilltree data previous class unlearn on all times.

This commit is contained in:
MobiusDevelopment
2021-01-02 11:21:17 +00:00
parent 4022b9f6cc
commit 0115c378a6
18 changed files with 54 additions and 66 deletions

View File

@@ -1476,7 +1476,7 @@ public class SkillTreeData implements IXmlReader
return result;
}
public void cleanSkillUponChangeClass(PlayerInstance player, boolean checkPreviousClasses)
public void cleanSkillUponChangeClass(PlayerInstance player)
{
ClassId currentClass = player.getClassId();
for (Skill skill : player.getAllSkills())
@@ -1510,24 +1510,21 @@ public class SkillTreeData implements IXmlReader
}
// Check previous classes as well, in case classes where skipped.
if (checkPreviousClasses)
while (currentClass.getParent() != null)
{
while (currentClass.getParent() != null)
final Set<Integer> removedList = _removeSkillCache.get(currentClass);
if (removedList != null)
{
final Set<Integer> removedList = _removeSkillCache.get(currentClass);
if (removedList != null)
for (Integer skillId : removedList)
{
for (Integer skillId : removedList)
final int currentLevel = player.getSkillLevel(skillId);
if (currentLevel > 0)
{
final int currentLevel = player.getSkillLevel(skillId);
if (currentLevel > 0)
{
player.removeSkill(SkillData.getInstance().getSkill(skillId, currentLevel));
}
player.removeSkill(SkillData.getInstance().getSkill(skillId, currentLevel));
}
}
currentClass = currentClass.getParent();
}
currentClass = currentClass.getParent();
}
}

View File

@@ -105,7 +105,7 @@ public class ExRequestClassChange implements IClientIncomingPacket
if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
{
SkillTreeData.getInstance().cleanSkillUponChangeClass(player, false); // TODO: Move to skill learn method?
SkillTreeData.getInstance().cleanSkillUponChangeClass(player); // TODO: Move to skill learn method?
for (SkillLearn skill : SkillTreeData.getInstance().getRaceSkillTree(player.getRace()))
{
player.addSkill(SkillData.getInstance().getSkill(skill.getSkillId(), skill.getSkillLevel()), true);