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

Fixed VIP system drop calculation NPE.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-12-08 04:03:06 +00:00
parent 540269eeb9
commit 6ea7138826
6 changed files with 84 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -774,9 +774,22 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
calculatedDrops.addAll(Config.CHAMPION_REWARD_ITEMS); calculatedDrops.addAll(Config.CHAMPION_REWARD_ITEMS);
} }
if (dropType == DropType.DROP) if (Config.VIP_SYSTEM_ENABLED && (dropType == DropType.DROP))
{ {
// list may be null here
if (calculatedDrops == null)
{
calculatedDrops = new ArrayList<>();
}
// calculate vip drops
processVipDrops(calculatedDrops, victim, killer); processVipDrops(calculatedDrops, victim, killer);
// returning empty list may cause problems
if (calculatedDrops.isEmpty())
{
calculatedDrops = null;
}
} }
return calculatedDrops; return calculatedDrops;

15
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -774,9 +774,22 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
calculatedDrops.addAll(Config.CHAMPION_REWARD_ITEMS); calculatedDrops.addAll(Config.CHAMPION_REWARD_ITEMS);
} }
if (dropType == DropType.DROP) if (Config.VIP_SYSTEM_ENABLED && (dropType == DropType.DROP))
{ {
// list may be null here
if (calculatedDrops == null)
{
calculatedDrops = new ArrayList<>();
}
// calculate vip drops
processVipDrops(calculatedDrops, victim, killer); processVipDrops(calculatedDrops, victim, killer);
// returning empty list may cause problems
if (calculatedDrops.isEmpty())
{
calculatedDrops = null;
}
} }
return calculatedDrops; return calculatedDrops;

15
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -774,9 +774,22 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
calculatedDrops.addAll(Config.CHAMPION_REWARD_ITEMS); calculatedDrops.addAll(Config.CHAMPION_REWARD_ITEMS);
} }
if (dropType == DropType.DROP) if (Config.VIP_SYSTEM_ENABLED && (dropType == DropType.DROP))
{ {
// list may be null here
if (calculatedDrops == null)
{
calculatedDrops = new ArrayList<>();
}
// calculate vip drops
processVipDrops(calculatedDrops, victim, killer); processVipDrops(calculatedDrops, victim, killer);
// returning empty list may cause problems
if (calculatedDrops.isEmpty())
{
calculatedDrops = null;
}
} }
return calculatedDrops; return calculatedDrops;

15
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -789,9 +789,22 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
calculatedDrops.addAll(Config.CHAMPION_REWARD_ITEMS); calculatedDrops.addAll(Config.CHAMPION_REWARD_ITEMS);
} }
if (dropType == DropType.DROP) if (Config.VIP_SYSTEM_ENABLED && (dropType == DropType.DROP))
{ {
// list may be null here
if (calculatedDrops == null)
{
calculatedDrops = new ArrayList<>();
}
// calculate vip drops
processVipDrops(calculatedDrops, victim, killer); processVipDrops(calculatedDrops, victim, killer);
// returning empty list may cause problems
if (calculatedDrops.isEmpty())
{
calculatedDrops = null;
}
} }
return calculatedDrops; return calculatedDrops;

15
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -789,9 +789,22 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
calculatedDrops.addAll(Config.CHAMPION_REWARD_ITEMS); calculatedDrops.addAll(Config.CHAMPION_REWARD_ITEMS);
} }
if (dropType == DropType.DROP) if (Config.VIP_SYSTEM_ENABLED && (dropType == DropType.DROP))
{ {
// list may be null here
if (calculatedDrops == null)
{
calculatedDrops = new ArrayList<>();
}
// calculate vip drops
processVipDrops(calculatedDrops, victim, killer); processVipDrops(calculatedDrops, victim, killer);
// returning empty list may cause problems
if (calculatedDrops.isEmpty())
{
calculatedDrops = null;
}
} }
return calculatedDrops; return calculatedDrops;

15
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -789,9 +789,22 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
calculatedDrops.addAll(Config.CHAMPION_REWARD_ITEMS); calculatedDrops.addAll(Config.CHAMPION_REWARD_ITEMS);
} }
if (dropType == DropType.DROP) if (Config.VIP_SYSTEM_ENABLED && (dropType == DropType.DROP))
{ {
// list may be null here
if (calculatedDrops == null)
{
calculatedDrops = new ArrayList<>();
}
// calculate vip drops
processVipDrops(calculatedDrops, victim, killer); processVipDrops(calculatedDrops, victim, killer);
// returning empty list may cause problems
if (calculatedDrops.isEmpty())
{
calculatedDrops = null;
}
} }
return calculatedDrops; return calculatedDrops;