Adjustments for cleanSkillUponChangeClass calls.

This commit is contained in:
MobiusDevelopment
2020-07-17 23:26:38 +00:00
parent 88570ccc47
commit 30bad9f604
6 changed files with 46 additions and 11 deletions

View File

@@ -33,7 +33,6 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.util.IXmlReader;
import org.l2jmobius.gameserver.data.xml.impl.CategoryData;
import org.l2jmobius.gameserver.data.xml.impl.ClassListData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.datatables.ItemTable;
import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.enums.Race;
@@ -384,13 +383,13 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
{
player.setBaseClass(player.getActiveClass());
}
SkillTreeData.getInstance().cleanSkillUponChangeClass(player, false);
// if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
// {
// for (SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
// {
// player.addSkill(SkillData.getInstance().getSkill(skill.getSkillId(), skill.getSkillLevel()), true);
// }
// SkillTreeData.getInstance().cleanSkillUponChangeClass(player, false);
// }
if (Config.AUTO_LEARN_SKILLS)
{
@@ -793,13 +792,13 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
{
player.setBaseClass(player.getActiveClass());
}
SkillTreeData.getInstance().cleanSkillUponChangeClass(player, false);
// if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
// {
// for (SkillLearn skill : SkillTreesData.getInstance().getRaceSkillTree(player.getRace()))
// {
// player.addSkill(SkillData.getInstance().getSkill(skill.getSkillId(), skill.getSkillLevel()), true);
// }
// SkillTreeData.getInstance().cleanSkillUponChangeClass(player, false);
// }
if (Config.AUTO_LEARN_SKILLS)
{

View File

@@ -32,7 +32,6 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory;
import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
import org.l2jmobius.gameserver.data.xml.impl.ClassListData;
import org.l2jmobius.gameserver.data.xml.impl.SkillTreeData;
import org.l2jmobius.gameserver.enums.Race;
import org.l2jmobius.gameserver.enums.SubclassInfoType;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -414,7 +413,10 @@ public class AdminEditChar implements IAdminCommandHandler
}
final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
SkillTreeData.getInstance().cleanSkillUponChangeClass(player, true);
// if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
// {
// SkillTreeData.getInstance().cleanSkillUponChangeClass(player, false);
// }
player.store(false);
player.broadcastUserInfo();
player.sendSkillList();