ClassId must be set after setting base class.

This commit is contained in:
MobiusDev
2017-10-01 19:43:52 +00:00
parent d975666566
commit 39c3d13c7d
14 changed files with 21 additions and 14 deletions

View File

@@ -359,7 +359,6 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
}
}
player.setClassId(classId);
if (player.isSubClassActive())
{
player.getSubClasses().get(player.getClassIndex()).setClassId(player.getActiveClass());
@@ -368,6 +367,8 @@ 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,7 +367,6 @@ 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());
@@ -376,6 +375,7 @@ public class AdminEditChar implements IAdminCommandHandler
{
player.setBaseClass(player.getActiveClass());
}
player.setClassId(classidval);
// Sex checks.
if (player.getRace().equals(Race.KAMAEL))