Fixed probable PlayerStat SubClassHolder NPE.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet;
 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.item.instance.Item;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
@@ -399,7 +400,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet;
 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.item.instance.Item;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
@@ -401,7 +402,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet;
 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.item.instance.Item;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
@@ -401,7 +402,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet;
 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.item.instance.Item;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
@@ -400,7 +401,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
+import org.l2jmobius.gameserver.model.holders.SubClassHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
@@ -392,7 +393,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
+import org.l2jmobius.gameserver.model.holders.SubClassHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
@@ -392,7 +393,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
+import org.l2jmobius.gameserver.model.holders.SubClassHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
@@ -392,7 +393,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
+import org.l2jmobius.gameserver.model.holders.SubClassHolder;
 import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
@@ -390,7 +391,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

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

@@ -391,7 +391,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -391,7 +391,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -391,7 +391,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
+import org.l2jmobius.gameserver.model.holders.SubClassHolder;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.stats.Formulas;
 import org.l2jmobius.gameserver.model.stats.MoveType;
@@ -416,7 +417,11 @@ public class PlayerStat extends PlayableStat
 	{
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.actor.transform.TransformTemplate;
 import org.l2jmobius.gameserver.model.effects.EffectType;
 import org.l2jmobius.gameserver.model.events.EventDispatcher;
 import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
+import org.l2jmobius.gameserver.model.holders.SubClassHolder;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.stats.Formulas;
 import org.l2jmobius.gameserver.model.stats.MoveType;
@@ -467,7 +468,11 @@ public class PlayerStat extends PlayableStat
 	{
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet;
 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.item.instance.Item;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
@@ -396,7 +397,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet;
 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.item.instance.Item;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
@@ -400,7 +401,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet;
 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.item.instance.Item;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
@@ -400,7 +401,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet;
 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.item.instance.Item;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
@@ -401,7 +402,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet;
 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.item.instance.Item;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
@@ -401,7 +402,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet;
 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.item.instance.Item;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
@@ -399,7 +400,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -29,6 +29,7 @@ import org.l2jmobius.gameserver.model.actor.instance.Pet;
 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.item.instance.Item;
 import org.l2jmobius.gameserver.model.item.type.WeaponType;
 import org.l2jmobius.gameserver.model.skill.AbnormalType;
@@ -400,7 +401,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -401,7 +401,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -401,7 +401,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}

L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -401,7 +401,11 @@ public class PlayerStat extends PlayableStat
 		}
 		if (getActiveChar().isSubClassActive())
 		{
-			return getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).getLevel();
+			final SubClassHolder holder = getActiveChar().getSubClasses().get(getActiveChar().getClassIndex());
+			if (holder != null)
+			{
+				return holder.getLevel();
+			}
 		}
 		return super.getLevel();
 	}