From 9a958449a0b439453ba76d50ebcf690cac6a5bde Mon Sep 17 00:00:00 2001 From: mobius <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 29 Jan 2015 19:25:38 +0000 Subject: [PATCH] Fixed possible NPE at Parade ai. --- .../data/scripts/ai/fantasy_isle/Parade.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/trunk/dist/game/data/scripts/ai/fantasy_isle/Parade.java b/trunk/dist/game/data/scripts/ai/fantasy_isle/Parade.java index 2d735a1624..b3511e8423 100644 --- a/trunk/dist/game/data/scripts/ai/fantasy_isle/Parade.java +++ b/trunk/dist/game/data/scripts/ai/fantasy_isle/Parade.java @@ -223,14 +223,17 @@ public class Parade extends AbstractNpcAI for (Iterator it = spawns.iterator(); it.hasNext();) { L2Npc actor = it.next(); - if (actor.calculateDistance(actor.getXdestination(), actor.getYdestination(), 0, false, true) < (100 * 100)) + if (actor != null) { - actor.deleteMe(); - it.remove(); - } - else if (!actor.isMoving()) - { - actor.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(actor.getXdestination(), actor.getYdestination(), actor.getZdestination(), actor.getHeading())); + if (actor.calculateDistance(actor.getXdestination(), actor.getYdestination(), 0, false, true) < (100 * 100)) + { + actor.deleteMe(); + it.remove(); + } + 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)