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

WalkingManager check for existing NPC.

Browse Source
This commit is contained in:
MobiusDev
2017-08-17 09:58:20 +00:00
parent 1f453fa880
commit e36f801082
4 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
L2J_Mobius_Classic/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
View File

@@ -30,6 +30,7 @@ import org.w3c.dom.Node;
import com.l2jmobius.commons.util.IGameXmlReader; import com.l2jmobius.commons.util.IGameXmlReader;
import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ThreadPoolManager;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.data.xml.impl.NpcData;
import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.instancemanager.tasks.StartMovingTask; import com.l2jmobius.gameserver.instancemanager.tasks.StartMovingTask;
import com.l2jmobius.gameserver.model.L2NpcWalkerNode; import com.l2jmobius.gameserver.model.L2NpcWalkerNode;
@@ -180,9 +181,16 @@ public final class WalkingManager implements IGameXmlReader
final int y = Integer.parseInt(attrs.getNamedItem("spawnY").getNodeValue()); final int y = Integer.parseInt(attrs.getNamedItem("spawnY").getNodeValue());
final int z = Integer.parseInt(attrs.getNamedItem("spawnZ").getNodeValue()); final int z = Integer.parseInt(attrs.getNamedItem("spawnZ").getNodeValue());
final NpcRoutesHolder holder = _routesToAttach.containsKey(npcId) ? _routesToAttach.get(npcId) : new NpcRoutesHolder(); if (NpcData.getInstance().getTemplate(npcId) != null)
holder.addRoute(routeName, new Location(x, y, z)); {
_routesToAttach.put(npcId, holder); final NpcRoutesHolder holder = _routesToAttach.containsKey(npcId) ? _routesToAttach.get(npcId) : new NpcRoutesHolder();
holder.addRoute(routeName, new Location(x, y, z));
_routesToAttach.put(npcId, holder);
}
else
{
LOGGER.warning(getClass().getSimpleName() + ": NPC with id " + npcId + " for route '" + routeName + "' does not exist.");
}
} }
catch (Exception e) catch (Exception e)
{ {

14
L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
View File

@@ -30,6 +30,7 @@ import org.w3c.dom.Node;
import com.l2jmobius.commons.util.IGameXmlReader; import com.l2jmobius.commons.util.IGameXmlReader;
import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ThreadPoolManager;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.data.xml.impl.NpcData;
import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.instancemanager.tasks.StartMovingTask; import com.l2jmobius.gameserver.instancemanager.tasks.StartMovingTask;
import com.l2jmobius.gameserver.model.L2NpcWalkerNode; import com.l2jmobius.gameserver.model.L2NpcWalkerNode;
@@ -180,9 +181,16 @@ public final class WalkingManager implements IGameXmlReader
final int y = Integer.parseInt(attrs.getNamedItem("spawnY").getNodeValue()); final int y = Integer.parseInt(attrs.getNamedItem("spawnY").getNodeValue());
final int z = Integer.parseInt(attrs.getNamedItem("spawnZ").getNodeValue()); final int z = Integer.parseInt(attrs.getNamedItem("spawnZ").getNodeValue());
final NpcRoutesHolder holder = _routesToAttach.containsKey(npcId) ? _routesToAttach.get(npcId) : new NpcRoutesHolder(); if (NpcData.getInstance().getTemplate(npcId) != null)
holder.addRoute(routeName, new Location(x, y, z)); {
_routesToAttach.put(npcId, holder); final NpcRoutesHolder holder = _routesToAttach.containsKey(npcId) ? _routesToAttach.get(npcId) : new NpcRoutesHolder();
holder.addRoute(routeName, new Location(x, y, z));
_routesToAttach.put(npcId, holder);
}
else
{
LOGGER.warning(getClass().getSimpleName() + ": NPC with id " + npcId + " for route '" + routeName + "' does not exist.");
}
} }
catch (Exception e) catch (Exception e)
{ {

14
L2J_Mobius_Helios/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
View File

@@ -30,6 +30,7 @@ import org.w3c.dom.Node;
import com.l2jmobius.commons.util.IGameXmlReader; import com.l2jmobius.commons.util.IGameXmlReader;
import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ThreadPoolManager;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.data.xml.impl.NpcData;
import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.instancemanager.tasks.StartMovingTask; import com.l2jmobius.gameserver.instancemanager.tasks.StartMovingTask;
import com.l2jmobius.gameserver.model.L2NpcWalkerNode; import com.l2jmobius.gameserver.model.L2NpcWalkerNode;
@@ -180,9 +181,16 @@ public final class WalkingManager implements IGameXmlReader
final int y = Integer.parseInt(attrs.getNamedItem("spawnY").getNodeValue()); final int y = Integer.parseInt(attrs.getNamedItem("spawnY").getNodeValue());
final int z = Integer.parseInt(attrs.getNamedItem("spawnZ").getNodeValue()); final int z = Integer.parseInt(attrs.getNamedItem("spawnZ").getNodeValue());
final NpcRoutesHolder holder = _routesToAttach.containsKey(npcId) ? _routesToAttach.get(npcId) : new NpcRoutesHolder(); if (NpcData.getInstance().getTemplate(npcId) != null)
holder.addRoute(routeName, new Location(x, y, z)); {
_routesToAttach.put(npcId, holder); final NpcRoutesHolder holder = _routesToAttach.containsKey(npcId) ? _routesToAttach.get(npcId) : new NpcRoutesHolder();
holder.addRoute(routeName, new Location(x, y, z));
_routesToAttach.put(npcId, holder);
}
else
{
LOGGER.warning(getClass().getSimpleName() + ": NPC with id " + npcId + " for route '" + routeName + "' does not exist.");
}
} }
catch (Exception e) catch (Exception e)
{ {

14
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java
View File

@@ -30,6 +30,7 @@ import org.w3c.dom.Node;
import com.l2jmobius.commons.util.IGameXmlReader; import com.l2jmobius.commons.util.IGameXmlReader;
import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ThreadPoolManager;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.data.xml.impl.NpcData;
import com.l2jmobius.gameserver.enums.ChatType; import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.instancemanager.tasks.StartMovingTask; import com.l2jmobius.gameserver.instancemanager.tasks.StartMovingTask;
import com.l2jmobius.gameserver.model.L2NpcWalkerNode; import com.l2jmobius.gameserver.model.L2NpcWalkerNode;
@@ -180,9 +181,16 @@ public final class WalkingManager implements IGameXmlReader
final int y = Integer.parseInt(attrs.getNamedItem("spawnY").getNodeValue()); final int y = Integer.parseInt(attrs.getNamedItem("spawnY").getNodeValue());
final int z = Integer.parseInt(attrs.getNamedItem("spawnZ").getNodeValue()); final int z = Integer.parseInt(attrs.getNamedItem("spawnZ").getNodeValue());
final NpcRoutesHolder holder = _routesToAttach.containsKey(npcId) ? _routesToAttach.get(npcId) : new NpcRoutesHolder(); if (NpcData.getInstance().getTemplate(npcId) != null)
holder.addRoute(routeName, new Location(x, y, z)); {
_routesToAttach.put(npcId, holder); final NpcRoutesHolder holder = _routesToAttach.containsKey(npcId) ? _routesToAttach.get(npcId) : new NpcRoutesHolder();
holder.addRoute(routeName, new Location(x, y, z));
_routesToAttach.put(npcId, holder);
}
else
{
LOGGER.warning(getClass().getSimpleName() + ": NPC with id " + npcId + " for route '" + routeName + "' does not exist.");
}
} }
catch (Exception e) catch (Exception e)
{ {