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

Fixed possible NPE at Parade ai.

Browse Source
This commit is contained in:
mobius
2015-01-29 19:25:38 +00:00
parent 6b7b09f11c
commit 9a958449a0
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
trunk/dist/game/data/scripts/ai/fantasy_isle/Parade.java vendored
View File

@@ -223,14 +223,17 @@ public class Parade extends AbstractNpcAI
for (Iterator<L2Npc> it = spawns.iterator(); it.hasNext();) for (Iterator<L2Npc> it = spawns.iterator(); it.hasNext();)
{ {
L2Npc actor = it.next(); L2Npc actor = it.next();
if (actor.calculateDistance(actor.getXdestination(), actor.getYdestination(), 0, false, true) < (100 * 100)) if (actor != null)
{ {
actor.deleteMe(); if (actor.calculateDistance(actor.getXdestination(), actor.getYdestination(), 0, false, true) < (100 * 100))
it.remove(); {
} actor.deleteMe();
else if (!actor.isMoving()) it.remove();
{ }
actor.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(actor.getXdestination(), actor.getYdestination(), actor.getZdestination(), actor.getHeading())); else if (!actor.isMoving())
{
actor.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(actor.getXdestination(), actor.getYdestination(), actor.getZdestination(), actor.getHeading()));
}
} }
} }
if (spawns.size() == 0) if (spawns.size() == 0)