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

Fix for probable Isabella AI NPE.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-10-22 16:00:08 +00:00
parent 0403790878
commit 21202c11b0
7 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java vendored
View File

@@ -18,6 +18,7 @@ package ai.areas.GardenOfSpirits;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@@ -90,9 +91,9 @@ public class Isabella extends AbstractNpcAI
@Override @Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) 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(); minion.deleteMe();
} }

5
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java vendored
View File

@@ -18,6 +18,7 @@ package ai.areas.GardenOfSpirits;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@@ -90,9 +91,9 @@ public class Isabella extends AbstractNpcAI
@Override @Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) 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(); minion.deleteMe();
} }

5
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java vendored
View File

@@ -18,6 +18,7 @@ package ai.areas.GardenOfSpirits;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@@ -90,9 +91,9 @@ public class Isabella extends AbstractNpcAI
@Override @Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) 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(); minion.deleteMe();
} }

5
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java vendored
View File

@@ -18,6 +18,7 @@ package ai.areas.GardenOfSpirits;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@@ -90,9 +91,9 @@ public class Isabella extends AbstractNpcAI
@Override @Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) 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(); minion.deleteMe();
} }

5
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java vendored
View File

@@ -18,6 +18,7 @@ package ai.areas.GardenOfSpirits;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@@ -90,9 +91,9 @@ public class Isabella extends AbstractNpcAI
@Override @Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) 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(); minion.deleteMe();
} }

5
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java vendored
View File

@@ -18,6 +18,7 @@ package ai.areas.GardenOfSpirits;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@@ -90,9 +91,9 @@ public class Isabella extends AbstractNpcAI
@Override @Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) 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(); minion.deleteMe();
} }

5
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/GardenOfSpirits/Isabella.java vendored
View File

@@ -18,6 +18,7 @@ package ai.areas.GardenOfSpirits;
import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import ai.AbstractNpcAI; import ai.AbstractNpcAI;
@@ -90,9 +91,9 @@ public class Isabella extends AbstractNpcAI
@Override @Override
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) 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(); minion.deleteMe();
} }