From f52b1e1bcc403c42f8dfd569962a7c8a77a9006e Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 9 May 2021 21:26:28 +0000 Subject: [PATCH] Fixed probable VipManager NPE. --- .../gameserver/model/vip/VipManager.java | 16 +++++++++++----- .../gameserver/model/vip/VipManager.java | 16 +++++++++++----- .../gameserver/model/vip/VipManager.java | 16 +++++++++++----- .../gameserver/model/vip/VipManager.java | 16 +++++++++++----- .../gameserver/model/vip/VipManager.java | 16 +++++++++++----- .../gameserver/model/vip/VipManager.java | 16 +++++++++++----- .../gameserver/model/vip/VipManager.java | 16 +++++++++++----- .../gameserver/model/vip/VipManager.java | 16 +++++++++++----- 8 files changed, 88 insertions(+), 40 deletions(-) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/vip/VipManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/vip/VipManager.java index 85fe139b05..9a807a99e3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/vip/VipManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/vip/VipManager.java @@ -176,16 +176,22 @@ public final class VipManager public long getPointsDepreciatedOnLevel(byte vipTier) { - return VipData.getInstance().getVipTiers().get(vipTier).getPointsDepreciated(); + final VipInfo tier = VipData.getInstance().getVipTiers().get(vipTier); + if (tier == null) + { + return 0; + } + return tier.getPointsDepreciated(); } - public long getPointsToLevel(byte level) + public long getPointsToLevel(byte vipTier) { - if (VipData.getInstance().getVipTiers().containsKey(level)) + final VipInfo tier = VipData.getInstance().getVipTiers().get(vipTier); + if (tier == null) { - return VipData.getInstance().getVipTiers().get(level).getPointsRequired(); + return 0; } - return 0; + return tier.getPointsRequired(); } public boolean checkVipTierExpiration(PlayerInstance player) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/vip/VipManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/vip/VipManager.java index 85fe139b05..9a807a99e3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/vip/VipManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/vip/VipManager.java @@ -176,16 +176,22 @@ public final class VipManager public long getPointsDepreciatedOnLevel(byte vipTier) { - return VipData.getInstance().getVipTiers().get(vipTier).getPointsDepreciated(); + final VipInfo tier = VipData.getInstance().getVipTiers().get(vipTier); + if (tier == null) + { + return 0; + } + return tier.getPointsDepreciated(); } - public long getPointsToLevel(byte level) + public long getPointsToLevel(byte vipTier) { - if (VipData.getInstance().getVipTiers().containsKey(level)) + final VipInfo tier = VipData.getInstance().getVipTiers().get(vipTier); + if (tier == null) { - return VipData.getInstance().getVipTiers().get(level).getPointsRequired(); + return 0; } - return 0; + return tier.getPointsRequired(); } public boolean checkVipTierExpiration(PlayerInstance player) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/vip/VipManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/vip/VipManager.java index 85fe139b05..9a807a99e3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/vip/VipManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/vip/VipManager.java @@ -176,16 +176,22 @@ public final class VipManager public long getPointsDepreciatedOnLevel(byte vipTier) { - return VipData.getInstance().getVipTiers().get(vipTier).getPointsDepreciated(); + final VipInfo tier = VipData.getInstance().getVipTiers().get(vipTier); + if (tier == null) + { + return 0; + } + return tier.getPointsDepreciated(); } - public long getPointsToLevel(byte level) + public long getPointsToLevel(byte vipTier) { - if (VipData.getInstance().getVipTiers().containsKey(level)) + final VipInfo tier = VipData.getInstance().getVipTiers().get(vipTier); + if (tier == null) { - return VipData.getInstance().getVipTiers().get(level).getPointsRequired(); + return 0; } - return 0; + return tier.getPointsRequired(); } public boolean checkVipTierExpiration(PlayerInstance player) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/vip/VipManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/vip/VipManager.java index 85fe139b05..9a807a99e3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/vip/VipManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/vip/VipManager.java @@ -176,16 +176,22 @@ public final class VipManager public long getPointsDepreciatedOnLevel(byte vipTier) { - return VipData.getInstance().getVipTiers().get(vipTier).getPointsDepreciated(); + final VipInfo tier = VipData.getInstance().getVipTiers().get(vipTier); + if (tier == null) + { + return 0; + } + return tier.getPointsDepreciated(); } - public long getPointsToLevel(byte level) + public long getPointsToLevel(byte vipTier) { - if (VipData.getInstance().getVipTiers().containsKey(level)) + final VipInfo tier = VipData.getInstance().getVipTiers().get(vipTier); + if (tier == null) { - return VipData.getInstance().getVipTiers().get(level).getPointsRequired(); + return 0; } - return 0; + return tier.getPointsRequired(); } public boolean checkVipTierExpiration(PlayerInstance player) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/vip/VipManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/vip/VipManager.java index 85fe139b05..9a807a99e3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/vip/VipManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/vip/VipManager.java @@ -176,16 +176,22 @@ public final class VipManager public long getPointsDepreciatedOnLevel(byte vipTier) { - return VipData.getInstance().getVipTiers().get(vipTier).getPointsDepreciated(); + final VipInfo tier = VipData.getInstance().getVipTiers().get(vipTier); + if (tier == null) + { + return 0; + } + return tier.getPointsDepreciated(); } - public long getPointsToLevel(byte level) + public long getPointsToLevel(byte vipTier) { - if (VipData.getInstance().getVipTiers().containsKey(level)) + final VipInfo tier = VipData.getInstance().getVipTiers().get(vipTier); + if (tier == null) { - return VipData.getInstance().getVipTiers().get(level).getPointsRequired(); + return 0; } - return 0; + return tier.getPointsRequired(); } public boolean checkVipTierExpiration(PlayerInstance player) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/vip/VipManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/vip/VipManager.java index 85fe139b05..9a807a99e3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/vip/VipManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/vip/VipManager.java @@ -176,16 +176,22 @@ public final class VipManager public long getPointsDepreciatedOnLevel(byte vipTier) { - return VipData.getInstance().getVipTiers().get(vipTier).getPointsDepreciated(); + final VipInfo tier = VipData.getInstance().getVipTiers().get(vipTier); + if (tier == null) + { + return 0; + } + return tier.getPointsDepreciated(); } - public long getPointsToLevel(byte level) + public long getPointsToLevel(byte vipTier) { - if (VipData.getInstance().getVipTiers().containsKey(level)) + final VipInfo tier = VipData.getInstance().getVipTiers().get(vipTier); + if (tier == null) { - return VipData.getInstance().getVipTiers().get(level).getPointsRequired(); + return 0; } - return 0; + return tier.getPointsRequired(); } public boolean checkVipTierExpiration(PlayerInstance player) diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/vip/VipManager.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/vip/VipManager.java index 9e427b6e91..5fc4a527f4 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/vip/VipManager.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/vip/VipManager.java @@ -166,16 +166,22 @@ public final class VipManager public long getPointsDepreciatedOnLevel(byte vipTier) { - return VipData.getInstance().getVipTiers().get(vipTier).getPointsDepreciated(); + final VipInfo tier = VipData.getInstance().getVipTiers().get(vipTier); + if (tier == null) + { + return 0; + } + return tier.getPointsDepreciated(); } - public long getPointsToLevel(byte level) + public long getPointsToLevel(byte vipTier) { - if (VipData.getInstance().getVipTiers().containsKey(level)) + final VipInfo tier = VipData.getInstance().getVipTiers().get(vipTier); + if (tier == null) { - return VipData.getInstance().getVipTiers().get(level).getPointsRequired(); + return 0; } - return 0; + return tier.getPointsRequired(); } public boolean checkVipTierExpiration(PlayerInstance player) diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/vip/VipManager.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/vip/VipManager.java index 9e427b6e91..5fc4a527f4 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/vip/VipManager.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/vip/VipManager.java @@ -166,16 +166,22 @@ public final class VipManager public long getPointsDepreciatedOnLevel(byte vipTier) { - return VipData.getInstance().getVipTiers().get(vipTier).getPointsDepreciated(); + final VipInfo tier = VipData.getInstance().getVipTiers().get(vipTier); + if (tier == null) + { + return 0; + } + return tier.getPointsDepreciated(); } - public long getPointsToLevel(byte level) + public long getPointsToLevel(byte vipTier) { - if (VipData.getInstance().getVipTiers().containsKey(level)) + final VipInfo tier = VipData.getInstance().getVipTiers().get(vipTier); + if (tier == null) { - return VipData.getInstance().getVipTiers().get(level).getPointsRequired(); + return 0; } - return 0; + return tier.getPointsRequired(); } public boolean checkVipTierExpiration(PlayerInstance player)