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

Fixed Frintezza onKill monster list NPE.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-03-11 00:05:59 +00:00
parent 75e0e632a4
commit 58a85d05f5
11 changed files with 110 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java vendored
View File

@ -754,12 +754,20 @@ public class LastImperialTomb extends AbstractInstance
else if (CommonUtil.contains(DEMONS, npc.getId())) else if (CommonUtil.contains(DEMONS, npc.getId()))
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final List<Npc> demons = world.getParameters().getList("demons", Npc.class);
demons.remove(npc); if (demons != null)
{
demons.remove(npc);
world.setParameter("demons", demons);
}
} }
else if (CommonUtil.contains(PORTRAITS, npc.getId())) else if (CommonUtil.contains(PORTRAITS, npc.getId()))
{ {
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
portraits.remove(npc); if (portraits != null)
{
portraits.remove(npc);
world.setParameter("portraits", portraits);
}
} }
else else
{ {

12
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java vendored
View File

@ -754,12 +754,20 @@ public class LastImperialTomb extends AbstractInstance
else if (CommonUtil.contains(DEMONS, npc.getId())) else if (CommonUtil.contains(DEMONS, npc.getId()))
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final List<Npc> demons = world.getParameters().getList("demons", Npc.class);
demons.remove(npc); if (demons != null)
{
demons.remove(npc);
world.setParameter("demons", demons);
}
} }
else if (CommonUtil.contains(PORTRAITS, npc.getId())) else if (CommonUtil.contains(PORTRAITS, npc.getId()))
{ {
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
portraits.remove(npc); if (portraits != null)
{
portraits.remove(npc);
world.setParameter("portraits", portraits);
}
} }
else else
{ {

12
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java vendored
View File

@ -754,12 +754,20 @@ public class LastImperialTomb extends AbstractInstance
else if (CommonUtil.contains(DEMONS, npc.getId())) else if (CommonUtil.contains(DEMONS, npc.getId()))
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final List<Npc> demons = world.getParameters().getList("demons", Npc.class);
demons.remove(npc); if (demons != null)
{
demons.remove(npc);
world.setParameter("demons", demons);
}
} }
else if (CommonUtil.contains(PORTRAITS, npc.getId())) else if (CommonUtil.contains(PORTRAITS, npc.getId()))
{ {
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
portraits.remove(npc); if (portraits != null)
{
portraits.remove(npc);
world.setParameter("portraits", portraits);
}
} }
else else
{ {

12
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java vendored
View File

@ -754,12 +754,20 @@ public class LastImperialTomb extends AbstractInstance
else if (CommonUtil.contains(DEMONS, npc.getId())) else if (CommonUtil.contains(DEMONS, npc.getId()))
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final List<Npc> demons = world.getParameters().getList("demons", Npc.class);
demons.remove(npc); if (demons != null)
{
demons.remove(npc);
world.setParameter("demons", demons);
}
} }
else if (CommonUtil.contains(PORTRAITS, npc.getId())) else if (CommonUtil.contains(PORTRAITS, npc.getId()))
{ {
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
portraits.remove(npc); if (portraits != null)
{
portraits.remove(npc);
world.setParameter("portraits", portraits);
}
} }
else else
{ {

12
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java vendored
View File

@ -754,12 +754,20 @@ public class LastImperialTomb extends AbstractInstance
else if (CommonUtil.contains(DEMONS, npc.getId())) else if (CommonUtil.contains(DEMONS, npc.getId()))
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final List<Npc> demons = world.getParameters().getList("demons", Npc.class);
demons.remove(npc); if (demons != null)
{
demons.remove(npc);
world.setParameter("demons", demons);
}
} }
else if (CommonUtil.contains(PORTRAITS, npc.getId())) else if (CommonUtil.contains(PORTRAITS, npc.getId()))
{ {
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
portraits.remove(npc); if (portraits != null)
{
portraits.remove(npc);
world.setParameter("portraits", portraits);
}
} }
else else
{ {

12
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java vendored
View File

@ -754,12 +754,20 @@ public class LastImperialTomb extends AbstractInstance
else if (CommonUtil.contains(DEMONS, npc.getId())) else if (CommonUtil.contains(DEMONS, npc.getId()))
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final List<Npc> demons = world.getParameters().getList("demons", Npc.class);
demons.remove(npc); if (demons != null)
{
demons.remove(npc);
world.setParameter("demons", demons);
}
} }
else if (CommonUtil.contains(PORTRAITS, npc.getId())) else if (CommonUtil.contains(PORTRAITS, npc.getId()))
{ {
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
portraits.remove(npc); if (portraits != null)
{
portraits.remove(npc);
world.setParameter("portraits", portraits);
}
} }
else else
{ {

12
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java vendored
View File

@ -754,12 +754,20 @@ public class LastImperialTomb extends AbstractInstance
else if (CommonUtil.contains(DEMONS, npc.getId())) else if (CommonUtil.contains(DEMONS, npc.getId()))
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final List<Npc> demons = world.getParameters().getList("demons", Npc.class);
demons.remove(npc); if (demons != null)
{
demons.remove(npc);
world.setParameter("demons", demons);
}
} }
else if (CommonUtil.contains(PORTRAITS, npc.getId())) else if (CommonUtil.contains(PORTRAITS, npc.getId()))
{ {
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
portraits.remove(npc); if (portraits != null)
{
portraits.remove(npc);
world.setParameter("portraits", portraits);
}
} }
else else
{ {

12
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java vendored
View File

@ -754,12 +754,20 @@ public class LastImperialTomb extends AbstractInstance
else if (CommonUtil.contains(DEMONS, npc.getId())) else if (CommonUtil.contains(DEMONS, npc.getId()))
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final List<Npc> demons = world.getParameters().getList("demons", Npc.class);
demons.remove(npc); if (demons != null)
{
demons.remove(npc);
world.setParameter("demons", demons);
}
} }
else if (CommonUtil.contains(PORTRAITS, npc.getId())) else if (CommonUtil.contains(PORTRAITS, npc.getId()))
{ {
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
portraits.remove(npc); if (portraits != null)
{
portraits.remove(npc);
world.setParameter("portraits", portraits);
}
} }
else else
{ {

12
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java vendored
View File

@ -756,12 +756,20 @@ public class LastImperialTomb extends AbstractInstance
else if (CommonUtil.contains(DEMONS, npc.getId())) else if (CommonUtil.contains(DEMONS, npc.getId()))
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final List<Npc> demons = world.getParameters().getList("demons", Npc.class);
demons.remove(npc); if (demons != null)
{
demons.remove(npc);
world.setParameter("demons", demons);
}
} }
else if (CommonUtil.contains(PORTRAITS, npc.getId())) else if (CommonUtil.contains(PORTRAITS, npc.getId()))
{ {
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
portraits.remove(npc); if (portraits != null)
{
portraits.remove(npc);
world.setParameter("portraits", portraits);
}
} }
else else
{ {

12
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/LastImperialTomb/LastImperialTomb.java vendored
View File

@ -756,12 +756,20 @@ public class LastImperialTomb extends AbstractInstance
else if (CommonUtil.contains(DEMONS, npc.getId())) else if (CommonUtil.contains(DEMONS, npc.getId()))
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final List<Npc> demons = world.getParameters().getList("demons", Npc.class);
demons.remove(npc); if (demons != null)
{
demons.remove(npc);
world.setParameter("demons", demons);
}
} }
else if (CommonUtil.contains(PORTRAITS, npc.getId())) else if (CommonUtil.contains(PORTRAITS, npc.getId()))
{ {
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
portraits.remove(npc); if (portraits != null)
{
portraits.remove(npc);
world.setParameter("portraits", portraits);
}
} }
else else
{ {

12
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/LastImperialTomb.java vendored
View File

@ -754,12 +754,20 @@ public class LastImperialTomb extends AbstractInstance
else if (CommonUtil.contains(DEMONS, npc.getId())) else if (CommonUtil.contains(DEMONS, npc.getId()))
{ {
final List<Npc> demons = world.getParameters().getList("demons", Npc.class); final List<Npc> demons = world.getParameters().getList("demons", Npc.class);
demons.remove(npc); if (demons != null)
{
demons.remove(npc);
world.setParameter("demons", demons);
}
} }
else if (CommonUtil.contains(PORTRAITS, npc.getId())) else if (CommonUtil.contains(PORTRAITS, npc.getId()))
{ {
final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class); final Map<Npc, Integer> portraits = world.getParameters().getMap("portraits", Npc.class, Integer.class);
portraits.remove(npc); if (portraits != null)
{
portraits.remove(npc);
world.setParameter("portraits", portraits);
}
} }
else else
{ {