From 21202c11b02e315fae9a579cd39150f0cc2a1ac6 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 22 Oct 2019 16:00:08 +0000 Subject: [PATCH] Fix for probable Isabella AI NPE. --- .../game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java | 5 +++-- .../game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java | 5 +++-- .../game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java | 5 +++-- .../game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java | 5 +++-- .../game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java | 5 +++-- .../game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java | 5 +++-- .../game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java | 5 +++-- 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java index 87b4eec780..f22566268a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java @@ -18,6 +18,7 @@ package ai.areas.GardenOfSpirits; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import ai.AbstractNpcAI; @@ -90,9 +91,9 @@ public class Isabella extends AbstractNpcAI @Override public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) { - World.getInstance().forEachVisibleObjectInRange(npc, Npc.class, 1500, minion -> + World.getInstance().forEachVisibleObjectInRange(npc, MonsterInstance.class, 1500, minion -> { - if ((minion.getId() == CROA) || (minion.getId() == AMIS)) + if ((minion != null) && !minion.isAlikeDead() && ((minion.getId() == CROA) || (minion.getId() == AMIS))) { minion.deleteMe(); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java index 87b4eec780..f22566268a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java @@ -18,6 +18,7 @@ package ai.areas.GardenOfSpirits; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import ai.AbstractNpcAI; @@ -90,9 +91,9 @@ public class Isabella extends AbstractNpcAI @Override public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) { - World.getInstance().forEachVisibleObjectInRange(npc, Npc.class, 1500, minion -> + World.getInstance().forEachVisibleObjectInRange(npc, MonsterInstance.class, 1500, minion -> { - if ((minion.getId() == CROA) || (minion.getId() == AMIS)) + if ((minion != null) && !minion.isAlikeDead() && ((minion.getId() == CROA) || (minion.getId() == AMIS))) { minion.deleteMe(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java index 87b4eec780..f22566268a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java @@ -18,6 +18,7 @@ package ai.areas.GardenOfSpirits; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import ai.AbstractNpcAI; @@ -90,9 +91,9 @@ public class Isabella extends AbstractNpcAI @Override public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) { - World.getInstance().forEachVisibleObjectInRange(npc, Npc.class, 1500, minion -> + World.getInstance().forEachVisibleObjectInRange(npc, MonsterInstance.class, 1500, minion -> { - if ((minion.getId() == CROA) || (minion.getId() == AMIS)) + if ((minion != null) && !minion.isAlikeDead() && ((minion.getId() == CROA) || (minion.getId() == AMIS))) { minion.deleteMe(); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java index 87b4eec780..f22566268a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java @@ -18,6 +18,7 @@ package ai.areas.GardenOfSpirits; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import ai.AbstractNpcAI; @@ -90,9 +91,9 @@ public class Isabella extends AbstractNpcAI @Override public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) { - World.getInstance().forEachVisibleObjectInRange(npc, Npc.class, 1500, minion -> + World.getInstance().forEachVisibleObjectInRange(npc, MonsterInstance.class, 1500, minion -> { - if ((minion.getId() == CROA) || (minion.getId() == AMIS)) + if ((minion != null) && !minion.isAlikeDead() && ((minion.getId() == CROA) || (minion.getId() == AMIS))) { minion.deleteMe(); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java index 87b4eec780..f22566268a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java @@ -18,6 +18,7 @@ package ai.areas.GardenOfSpirits; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import ai.AbstractNpcAI; @@ -90,9 +91,9 @@ public class Isabella extends AbstractNpcAI @Override public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) { - World.getInstance().forEachVisibleObjectInRange(npc, Npc.class, 1500, minion -> + World.getInstance().forEachVisibleObjectInRange(npc, MonsterInstance.class, 1500, minion -> { - if ((minion.getId() == CROA) || (minion.getId() == AMIS)) + if ((minion != null) && !minion.isAlikeDead() && ((minion.getId() == CROA) || (minion.getId() == AMIS))) { minion.deleteMe(); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java index 87b4eec780..f22566268a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java @@ -18,6 +18,7 @@ package ai.areas.GardenOfSpirits; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import ai.AbstractNpcAI; @@ -90,9 +91,9 @@ public class Isabella extends AbstractNpcAI @Override public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) { - World.getInstance().forEachVisibleObjectInRange(npc, Npc.class, 1500, minion -> + World.getInstance().forEachVisibleObjectInRange(npc, MonsterInstance.class, 1500, minion -> { - if ((minion.getId() == CROA) || (minion.getId() == AMIS)) + if ((minion != null) && !minion.isAlikeDead() && ((minion.getId() == CROA) || (minion.getId() == AMIS))) { minion.deleteMe(); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java index 87b4eec780..f22566268a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java @@ -18,6 +18,7 @@ package ai.areas.GardenOfSpirits; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import ai.AbstractNpcAI; @@ -90,9 +91,9 @@ public class Isabella extends AbstractNpcAI @Override public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) { - World.getInstance().forEachVisibleObjectInRange(npc, Npc.class, 1500, minion -> + World.getInstance().forEachVisibleObjectInRange(npc, MonsterInstance.class, 1500, minion -> { - if ((minion.getId() == CROA) || (minion.getId() == AMIS)) + if ((minion != null) && !minion.isAlikeDead() && ((minion.getId() == CROA) || (minion.getId() == AMIS))) { minion.deleteMe(); }