Better solution for auto giving skills.

This commit is contained in:
MobiusDev
2017-10-01 21:10:20 +00:00
parent 86b294a4f1
commit 6a714ee6c9
18 changed files with 18 additions and 25 deletions

View File

@@ -359,6 +359,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
}
}
player.setClassId(classId);
if (player.isSubClassActive())
{
player.getSubClasses().get(player.getClassIndex()).setClassId(player.getActiveClass());
@@ -367,8 +368,6 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
{
player.setBaseClass(player.getActiveClass());
}
player.setClassId(classId);
if (player.isInCategory(CategoryType.AWAKEN_GROUP))
{
SkillTreesData.getInstance().cleanSkillUponAwakening(player);

View File

@@ -367,6 +367,7 @@ public class AdminEditChar implements IAdminCommandHandler
final L2PcInstance player = target.getActingPlayer();
if ((ClassId.getClassId(classidval) != null) && (player.getClassId().getId() != classidval))
{
player.setClassId(classidval);
if (player.isSubClassActive())
{
player.getSubClasses().get(player.getClassIndex()).setClassId(player.getActiveClass());
@@ -375,7 +376,6 @@ public class AdminEditChar implements IAdminCommandHandler
{
player.setBaseClass(player.getActiveClass());
}
player.setClassId(classidval);
// Sex checks.
if (player.getRace().equals(Race.KAMAEL))

View File

@@ -2579,7 +2579,7 @@ public final class L2PcInstance extends L2Playable
{
int skillCounter = 0;
// Get available skills
final Collection<Skill> skills = SkillTreesData.getInstance().getAllAvailableSkills(this, getClassId(), includedByFs, includeAutoGet);
final Collection<Skill> skills = SkillTreesData.getInstance().getAllAvailableSkills(this, getTemplate().getClassId(), includedByFs, includeAutoGet);
final List<Skill> skillsForStore = new ArrayList<>();
for (Skill skill : skills)