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

Prevent ExUserBoostStat NPE when switching class.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-11-14 12:24:15 +00:00
parent 2d581185d6
commit 879d0e766e
6 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
View File

@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.events.EventDispatcher;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
import org.l2jmobius.gameserver.model.holders.ItemSkillHolder;
import org.l2jmobius.gameserver.model.holders.SubClassHolder;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.items.type.WeaponType;
import org.l2jmobius.gameserver.model.skills.AbnormalType;
@ -469,7 +470,12 @@ public class PlayerStat extends PlayableStat
{
if (getActiveChar().isSubClassActive())
{
return Math.min(MAX_VITALITY_POINTS, getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getVitalityPoints());
final SubClassHolder subClassHolder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
if (subClassHolder == null)
{
return 0;
}
return Math.min(MAX_VITALITY_POINTS, subClassHolder.getVitalityPoints());
}
return Math.min(Math.max(_vitalityPoints, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
}