lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed probable re-awake dual class NPE.

Browse Source
This commit is contained in:
MobiusDev 2018-04-26 09:33:28 +00:00
parent 133d23af20
commit 124e59a3a9
6 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
View File

@ -398,11 +398,14 @@ public class PcStat extends PlayableStat
@Override @Override
public final byte getLevel() public final byte getLevel()
{ {
if (getActiveChar().isDualClassActive())
{
return getActiveChar().getDualClass().getLevel();
}
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel(); return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
} }
return super.getLevel(); return super.getLevel();
} }

5
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
View File

@ -400,11 +400,14 @@ public class PcStat extends PlayableStat
@Override @Override
public final byte getLevel() public final byte getLevel()
{ {
if (getActiveChar().isDualClassActive())
{
return getActiveChar().getDualClass().getLevel();
}
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel(); return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
} }
return super.getLevel(); return super.getLevel();
} }

5
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
View File

@ -400,11 +400,14 @@ public class PcStat extends PlayableStat
@Override @Override
public final byte getLevel() public final byte getLevel()
{ {
if (getActiveChar().isDualClassActive())
{
return getActiveChar().getDualClass().getLevel();
}
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel(); return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
} }
return super.getLevel(); return super.getLevel();
} }

5
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
View File

@ -395,11 +395,14 @@ public class PcStat extends PlayableStat
@Override @Override
public final byte getLevel() public final byte getLevel()
{ {
if (getActiveChar().isDualClassActive())
{
return getActiveChar().getDualClass().getLevel();
}
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel(); return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
} }
return super.getLevel(); return super.getLevel();
} }

5
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
View File

@ -395,11 +395,14 @@ public class PcStat extends PlayableStat
@Override @Override
public final byte getLevel() public final byte getLevel()
{ {
if (getActiveChar().isDualClassActive())
{
return getActiveChar().getDualClass().getLevel();
}
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel(); return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
} }
return super.getLevel(); return super.getLevel();
} }

5
L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
View File

@ -395,11 +395,14 @@ public class PcStat extends PlayableStat
@Override @Override
public final byte getLevel() public final byte getLevel()
{ {
if (getActiveChar().isDualClassActive())
{
return getActiveChar().getDualClass().getLevel();
}
if (getActiveChar().isSubClassActive()) if (getActiveChar().isSubClassActive())
{ {
return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel(); return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
} }
return super.getLevel(); return super.getLevel();
} }