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

Fixed probable VipManager NPE.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-05-09 21:26:28 +00:00
parent 8066c8348f
commit f52b1e1bcc
8 changed files with 88 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/vip/VipManager.java
View File

@@ -176,16 +176,22 @@ public final class VipManager
public long getPointsDepreciatedOnLevel(byte vipTier) 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) public boolean checkVipTierExpiration(PlayerInstance player)

16
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/vip/VipManager.java
View File

@@ -176,16 +176,22 @@ public final class VipManager
public long getPointsDepreciatedOnLevel(byte vipTier) 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) public boolean checkVipTierExpiration(PlayerInstance player)

16
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/vip/VipManager.java
View File

@@ -176,16 +176,22 @@ public final class VipManager
public long getPointsDepreciatedOnLevel(byte vipTier) 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) public boolean checkVipTierExpiration(PlayerInstance player)

16
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/vip/VipManager.java
View File

@@ -176,16 +176,22 @@ public final class VipManager
public long getPointsDepreciatedOnLevel(byte vipTier) 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) public boolean checkVipTierExpiration(PlayerInstance player)

16
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/vip/VipManager.java
View File

@@ -176,16 +176,22 @@ public final class VipManager
public long getPointsDepreciatedOnLevel(byte vipTier) 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) public boolean checkVipTierExpiration(PlayerInstance player)

16
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/vip/VipManager.java
View File

@@ -176,16 +176,22 @@ public final class VipManager
public long getPointsDepreciatedOnLevel(byte vipTier) 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) public boolean checkVipTierExpiration(PlayerInstance player)

16
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/vip/VipManager.java
View File

@@ -166,16 +166,22 @@ public final class VipManager
public long getPointsDepreciatedOnLevel(byte vipTier) 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) public boolean checkVipTierExpiration(PlayerInstance player)

16
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/vip/VipManager.java
View File

@@ -166,16 +166,22 @@ public final class VipManager
public long getPointsDepreciatedOnLevel(byte vipTier) 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) public boolean checkVipTierExpiration(PlayerInstance player)