From c52d596d7903a23bdb29be6fee928a2cf37f3452 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 21 Oct 2021 21:19:28 +0000 Subject: [PATCH] Fixed ElementalSpiritTemplateHolder getMaxExperienceAtLevel NPE. --- .../model/holders/ElementalSpiritTemplateHolder.java | 3 ++- .../model/holders/ElementalSpiritTemplateHolder.java | 3 ++- .../model/holders/ElementalSpiritTemplateHolder.java | 3 ++- .../model/holders/ElementalSpiritTemplateHolder.java | 3 ++- .../model/holders/ElementalSpiritTemplateHolder.java | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java index fcac778ac9..9548a7feb9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java @@ -84,7 +84,8 @@ public class ElementalSpiritTemplateHolder public long getMaxExperienceAtLevel(byte level) { - return _levels.get(level).maxExperience; + final SpiritLevel spiritLevel = _levels.get(level); + return spiritLevel == null ? 0 : spiritLevel.maxExperience; } public int getMaxLevel() diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java index fcac778ac9..9548a7feb9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java @@ -84,7 +84,8 @@ public class ElementalSpiritTemplateHolder public long getMaxExperienceAtLevel(byte level) { - return _levels.get(level).maxExperience; + final SpiritLevel spiritLevel = _levels.get(level); + return spiritLevel == null ? 0 : spiritLevel.maxExperience; } public int getMaxLevel() diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java index fcac778ac9..9548a7feb9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java @@ -84,7 +84,8 @@ public class ElementalSpiritTemplateHolder public long getMaxExperienceAtLevel(byte level) { - return _levels.get(level).maxExperience; + final SpiritLevel spiritLevel = _levels.get(level); + return spiritLevel == null ? 0 : spiritLevel.maxExperience; } public int getMaxLevel() diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java index fcac778ac9..9548a7feb9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java @@ -84,7 +84,8 @@ public class ElementalSpiritTemplateHolder public long getMaxExperienceAtLevel(byte level) { - return _levels.get(level).maxExperience; + final SpiritLevel spiritLevel = _levels.get(level); + return spiritLevel == null ? 0 : spiritLevel.maxExperience; } public int getMaxLevel() diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java index fcac778ac9..9548a7feb9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/ElementalSpiritTemplateHolder.java @@ -84,7 +84,8 @@ public class ElementalSpiritTemplateHolder public long getMaxExperienceAtLevel(byte level) { - return _levels.get(level).maxExperience; + final SpiritLevel spiritLevel = _levels.get(level); + return spiritLevel == null ? 0 : spiritLevel.maxExperience; } public int getMaxLevel()