Store Npc isWalker in a simple boolean instead of checking WalkingManager.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java

@@ -247,7 +247,7 @@ public class WalkingManager implements IXmlReader
 	 * @param npc NPC to check
 	 * @return {@code true} if given NPC controlled by Walking Manager.
 	 */
-	public boolean isRegistered(Npc npc)
+	private boolean isRegistered(Npc npc)
 	{
 		return _activeRoutes.containsKey(npc.getObjectId());
 	}
@@ -309,6 +309,7 @@ public class WalkingManager implements IXmlReader
 						walk.setWalkCheckTask(newTask); // start walk check task, for resuming walk after fight
 					}
 					
+					npc.setWalker();
 					_activeRoutes.put(npc.getObjectId(), walk); // register route
 				}
 				else

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java

@@ -126,6 +126,7 @@ public class Npc extends Creature
 	/** Support for random animation switching */
 	private boolean _isRandomAnimationEnabled = true;
 	private boolean _isRandomWalkingEnabled = true;
+	private boolean _isWalker = false;
 	private boolean _isTalkable = getTemplate().isTalkable();
 	private final boolean _isQuestMonster = getTemplate().isQuestMonster();
 	private final boolean _isFakePlayer = getTemplate().isFakePlayer();
@@ -1359,13 +1360,15 @@ public class Npc extends Creature
 		broadcastInfo();
 	}
 	
-	/**
-	 * @return {@code true} if this Npc is registered in WalkingManager
-	 */
 	@Override
 	public boolean isWalker()
 	{
-		return WalkingManager.getInstance().isRegistered(this);
+		return _isWalker;
+	}
+	
+	public void setWalker()
+	{
+		_isWalker = true;
 	}
 	
 	@Override

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java

@@ -247,7 +247,7 @@ public class WalkingManager implements IXmlReader
 	 * @param npc NPC to check
 	 * @return {@code true} if given NPC controlled by Walking Manager.
 	 */
-	public boolean isRegistered(Npc npc)
+	private boolean isRegistered(Npc npc)
 	{
 		return _activeRoutes.containsKey(npc.getObjectId());
 	}
@@ -309,6 +309,7 @@ public class WalkingManager implements IXmlReader
 						walk.setWalkCheckTask(newTask); // start walk check task, for resuming walk after fight
 					}
 					
+					npc.setWalker();
 					_activeRoutes.put(npc.getObjectId(), walk); // register route
 				}
 				else

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java

@@ -126,6 +126,7 @@ public class Npc extends Creature
 	/** Support for random animation switching */
 	private boolean _isRandomAnimationEnabled = true;
 	private boolean _isRandomWalkingEnabled = true;
+	private boolean _isWalker = false;
 	private boolean _isTalkable = getTemplate().isTalkable();
 	private final boolean _isQuestMonster = getTemplate().isQuestMonster();
 	private final boolean _isFakePlayer = getTemplate().isFakePlayer();
@@ -1359,13 +1360,15 @@ public class Npc extends Creature
 		broadcastInfo();
 	}
 	
-	/**
-	 * @return {@code true} if this Npc is registered in WalkingManager
-	 */
 	@Override
 	public boolean isWalker()
 	{
-		return WalkingManager.getInstance().isRegistered(this);
+		return _isWalker;
+	}
+	
+	public void setWalker()
+	{
+		_isWalker = true;
 	}
 	
 	@Override

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java

@@ -247,7 +247,7 @@ public class WalkingManager implements IXmlReader
 	 * @param npc NPC to check
 	 * @return {@code true} if given NPC controlled by Walking Manager.
 	 */
-	public boolean isRegistered(Npc npc)
+	private boolean isRegistered(Npc npc)
 	{
 		return _activeRoutes.containsKey(npc.getObjectId());
 	}
@@ -309,6 +309,7 @@ public class WalkingManager implements IXmlReader
 						walk.setWalkCheckTask(newTask); // start walk check task, for resuming walk after fight
 					}
 					
+					npc.setWalker();
 					_activeRoutes.put(npc.getObjectId(), walk); // register route
 				}
 				else

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java

@@ -126,6 +126,7 @@ public class Npc extends Creature
 	/** Support for random animation switching */
 	private boolean _isRandomAnimationEnabled = true;
 	private boolean _isRandomWalkingEnabled = true;
+	private boolean _isWalker = false;
 	private boolean _isTalkable = getTemplate().isTalkable();
 	private final boolean _isQuestMonster = getTemplate().isQuestMonster();
 	private final boolean _isFakePlayer = getTemplate().isFakePlayer();
@@ -1359,13 +1360,15 @@ public class Npc extends Creature
 		broadcastInfo();
 	}
 	
-	/**
-	 * @return {@code true} if this Npc is registered in WalkingManager
-	 */
 	@Override
 	public boolean isWalker()
 	{
-		return WalkingManager.getInstance().isRegistered(this);
+		return _isWalker;
+	}
+	
+	public void setWalker()
+	{
+		_isWalker = true;
 	}
 	
 	@Override

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java

@@ -247,7 +247,7 @@ public class WalkingManager implements IXmlReader
 	 * @param npc NPC to check
 	 * @return {@code true} if given NPC controlled by Walking Manager.
 	 */
-	public boolean isRegistered(Npc npc)
+	private boolean isRegistered(Npc npc)
 	{
 		return _activeRoutes.containsKey(npc.getObjectId());
 	}
@@ -309,6 +309,7 @@ public class WalkingManager implements IXmlReader
 						walk.setWalkCheckTask(newTask); // start walk check task, for resuming walk after fight
 					}
 					
+					npc.setWalker();
 					_activeRoutes.put(npc.getObjectId(), walk); // register route
 				}
 				else

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java

@@ -126,6 +126,7 @@ public class Npc extends Creature
 	/** Support for random animation switching */
 	private boolean _isRandomAnimationEnabled = true;
 	private boolean _isRandomWalkingEnabled = true;
+	private boolean _isWalker = false;
 	private boolean _isTalkable = getTemplate().isTalkable();
 	private final boolean _isQuestMonster = getTemplate().isQuestMonster();
 	private final boolean _isFakePlayer = getTemplate().isFakePlayer();
@@ -1359,13 +1360,15 @@ public class Npc extends Creature
 		broadcastInfo();
 	}
 	
-	/**
-	 * @return {@code true} if this Npc is registered in WalkingManager
-	 */
 	@Override
 	public boolean isWalker()
 	{
-		return WalkingManager.getInstance().isRegistered(this);
+		return _isWalker;
+	}
+	
+	public void setWalker()
+	{
+		_isWalker = true;
 	}
 	
 	@Override

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java

@@ -247,7 +247,7 @@ public class WalkingManager implements IXmlReader
 	 * @param npc NPC to check
 	 * @return {@code true} if given NPC controlled by Walking Manager.
 	 */
-	public boolean isRegistered(Npc npc)
+	private boolean isRegistered(Npc npc)
 	{
 		return _activeRoutes.containsKey(npc.getObjectId());
 	}
@@ -309,6 +309,7 @@ public class WalkingManager implements IXmlReader
 						walk.setWalkCheckTask(newTask); // start walk check task, for resuming walk after fight
 					}
 					
+					npc.setWalker();
 					_activeRoutes.put(npc.getObjectId(), walk); // register route
 				}
 				else

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java

@@ -126,6 +126,7 @@ public class Npc extends Creature
 	/** Support for random animation switching */
 	private boolean _isRandomAnimationEnabled = true;
 	private boolean _isRandomWalkingEnabled = true;
+	private boolean _isWalker = false;
 	private boolean _isTalkable = getTemplate().isTalkable();
 	private final boolean _isQuestMonster = getTemplate().isQuestMonster();
 	private final boolean _isFakePlayer = getTemplate().isFakePlayer();
@@ -1359,13 +1360,15 @@ public class Npc extends Creature
 		broadcastInfo();
 	}
 	
-	/**
-	 * @return {@code true} if this Npc is registered in WalkingManager
-	 */
 	@Override
 	public boolean isWalker()
 	{
-		return WalkingManager.getInstance().isRegistered(this);
+		return _isWalker;
+	}
+	
+	public void setWalker()
+	{
+		_isWalker = true;
 	}
 	
 	@Override

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java

@@ -247,7 +247,7 @@ public class WalkingManager implements IXmlReader
 	 * @param npc NPC to check
 	 * @return {@code true} if given NPC controlled by Walking Manager.
 	 */
-	public boolean isRegistered(Npc npc)
+	private boolean isRegistered(Npc npc)
 	{
 		return _activeRoutes.containsKey(npc.getObjectId());
 	}
@@ -309,6 +309,7 @@ public class WalkingManager implements IXmlReader
 						walk.setWalkCheckTask(newTask); // start walk check task, for resuming walk after fight
 					}
 					
+					npc.setWalker();
 					_activeRoutes.put(npc.getObjectId(), walk); // register route
 				}
 				else

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java

@@ -126,6 +126,7 @@ public class Npc extends Creature
 	/** Support for random animation switching */
 	private boolean _isRandomAnimationEnabled = true;
 	private boolean _isRandomWalkingEnabled = true;
+	private boolean _isWalker = false;
 	private boolean _isTalkable = getTemplate().isTalkable();
 	private final boolean _isQuestMonster = getTemplate().isQuestMonster();
 	private final boolean _isFakePlayer = getTemplate().isFakePlayer();
@@ -1359,13 +1360,15 @@ public class Npc extends Creature
 		broadcastInfo();
 	}
 	
-	/**
-	 * @return {@code true} if this Npc is registered in WalkingManager
-	 */
 	@Override
 	public boolean isWalker()
 	{
-		return WalkingManager.getInstance().isRegistered(this);
+		return _isWalker;
+	}
+	
+	public void setWalker()
+	{
+		_isWalker = true;
 	}
 	
 	@Override

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java

@@ -247,7 +247,7 @@ public class WalkingManager implements IXmlReader
 	 * @param npc NPC to check
 	 * @return {@code true} if given NPC controlled by Walking Manager.
 	 */
-	public boolean isRegistered(Npc npc)
+	private boolean isRegistered(Npc npc)
 	{
 		return _activeRoutes.containsKey(npc.getObjectId());
 	}
@@ -309,6 +309,7 @@ public class WalkingManager implements IXmlReader
 						walk.setWalkCheckTask(newTask); // start walk check task, for resuming walk after fight
 					}
 					
+					npc.setWalker();
 					_activeRoutes.put(npc.getObjectId(), walk); // register route
 				}
 				else

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java

@@ -126,6 +126,7 @@ public class Npc extends Creature
 	/** Support for random animation switching */
 	private boolean _isRandomAnimationEnabled = true;
 	private boolean _isRandomWalkingEnabled = true;
+	private boolean _isWalker = false;
 	private boolean _isTalkable = getTemplate().isTalkable();
 	private final boolean _isQuestMonster = getTemplate().isQuestMonster();
 	private final boolean _isFakePlayer = getTemplate().isFakePlayer();
@@ -1359,13 +1360,15 @@ public class Npc extends Creature
 		broadcastInfo();
 	}
 	
-	/**
-	 * @return {@code true} if this Npc is registered in WalkingManager
-	 */
 	@Override
 	public boolean isWalker()
 	{
-		return WalkingManager.getInstance().isRegistered(this);
+		return _isWalker;
+	}
+	
+	public void setWalker()
+	{
+		_isWalker = true;
 	}
 	
 	@Override

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java

@@ -247,7 +247,7 @@ public class WalkingManager implements IXmlReader
 	 * @param npc NPC to check
 	 * @return {@code true} if given NPC controlled by Walking Manager.
 	 */
-	public boolean isRegistered(Npc npc)
+	private boolean isRegistered(Npc npc)
 	{
 		return _activeRoutes.containsKey(npc.getObjectId());
 	}
@@ -309,6 +309,7 @@ public class WalkingManager implements IXmlReader
 						walk.setWalkCheckTask(newTask); // start walk check task, for resuming walk after fight
 					}
 					
+					npc.setWalker();
 					_activeRoutes.put(npc.getObjectId(), walk); // register route
 				}
 				else

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java

@@ -126,6 +126,7 @@ public class Npc extends Creature
 	/** Support for random animation switching */
 	private boolean _isRandomAnimationEnabled = true;
 	private boolean _isRandomWalkingEnabled = true;
+	private boolean _isWalker = false;
 	private boolean _isTalkable = getTemplate().isTalkable();
 	private final boolean _isQuestMonster = getTemplate().isQuestMonster();
 	private final boolean _isFakePlayer = getTemplate().isFakePlayer();
@@ -1359,13 +1360,15 @@ public class Npc extends Creature
 		broadcastInfo();
 	}
 	
-	/**
-	 * @return {@code true} if this Npc is registered in WalkingManager
-	 */
 	@Override
 	public boolean isWalker()
 	{
-		return WalkingManager.getInstance().isRegistered(this);
+		return _isWalker;
+	}
+	
+	public void setWalker()
+	{
+		_isWalker = true;
 	}
 	
 	@Override

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java

@@ -247,7 +247,7 @@ public class WalkingManager implements IXmlReader
 	 * @param npc NPC to check
 	 * @return {@code true} if given NPC controlled by Walking Manager.
 	 */
-	public boolean isRegistered(Npc npc)
+	private boolean isRegistered(Npc npc)
 	{
 		return _activeRoutes.containsKey(npc.getObjectId());
 	}
@@ -309,6 +309,7 @@ public class WalkingManager implements IXmlReader
 						walk.setWalkCheckTask(newTask); // start walk check task, for resuming walk after fight
 					}
 					
+					npc.setWalker();
 					_activeRoutes.put(npc.getObjectId(), walk); // register route
 				}
 				else

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java

@@ -134,6 +134,7 @@ public class Npc extends Creature
 	/** Support for random animation switching */
 	private boolean _isRandomAnimationEnabled = true;
 	private boolean _isRandomWalkingEnabled = true;
+	private boolean _isWalker = false;
 	private boolean _isTalkable = getTemplate().isTalkable();
 	private final boolean _isQuestMonster = getTemplate().isQuestMonster();
 	private final boolean _isFakePlayer = getTemplate().isFakePlayer();
@@ -1589,13 +1590,15 @@ public class Npc extends Creature
 		broadcastInfo();
 	}
 	
-	/**
-	 * @return {@code true} if this Npc is registered in WalkingManager
-	 */
 	@Override
 	public boolean isWalker()
 	{
-		return WalkingManager.getInstance().isRegistered(this);
+		return _isWalker;
+	}
+	
+	public void setWalker()
+	{
+		_isWalker = true;
 	}
 	
 	@Override

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java

@@ -247,7 +247,7 @@ public class WalkingManager implements IXmlReader
 	 * @param npc NPC to check
 	 * @return {@code true} if given NPC controlled by Walking Manager.
 	 */
-	public boolean isRegistered(Npc npc)
+	private boolean isRegistered(Npc npc)
 	{
 		return _activeRoutes.containsKey(npc.getObjectId());
 	}
@@ -309,6 +309,7 @@ public class WalkingManager implements IXmlReader
 						walk.setWalkCheckTask(newTask); // start walk check task, for resuming walk after fight
 					}
 					
+					npc.setWalker();
 					_activeRoutes.put(npc.getObjectId(), walk); // register route
 				}
 				else

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java

@@ -134,6 +134,7 @@ public class Npc extends Creature
 	/** Support for random animation switching */
 	private boolean _isRandomAnimationEnabled = true;
 	private boolean _isRandomWalkingEnabled = true;
+	private boolean _isWalker = false;
 	private boolean _isTalkable = getTemplate().isTalkable();
 	private final boolean _isQuestMonster = getTemplate().isQuestMonster();
 	private final boolean _isFakePlayer = getTemplate().isFakePlayer();
@@ -1589,13 +1590,15 @@ public class Npc extends Creature
 		broadcastInfo();
 	}
 	
-	/**
-	 * @return {@code true} if this Npc is registered in WalkingManager
-	 */
 	@Override
 	public boolean isWalker()
 	{
-		return WalkingManager.getInstance().isRegistered(this);
+		return _isWalker;
+	}
+	
+	public void setWalker()
+	{
+		_isWalker = true;
 	}
 	
 	@Override

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java

@@ -247,7 +247,7 @@ public class WalkingManager implements IXmlReader
 	 * @param npc NPC to check
 	 * @return {@code true} if given NPC controlled by Walking Manager.
 	 */
-	public boolean isRegistered(Npc npc)
+	private boolean isRegistered(Npc npc)
 	{
 		return _activeRoutes.containsKey(npc.getObjectId());
 	}
@@ -309,6 +309,7 @@ public class WalkingManager implements IXmlReader
 						walk.setWalkCheckTask(newTask); // start walk check task, for resuming walk after fight
 					}
 					
+					npc.setWalker();
 					_activeRoutes.put(npc.getObjectId(), walk); // register route
 				}
 				else

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java

@@ -126,6 +126,7 @@ public class Npc extends Creature
 	/** Support for random animation switching */
 	private boolean _isRandomAnimationEnabled = true;
 	private boolean _isRandomWalkingEnabled = true;
+	private boolean _isWalker = false;
 	private boolean _isTalkable = getTemplate().isTalkable();
 	private final boolean _isQuestMonster = getTemplate().isQuestMonster();
 	private final boolean _isFakePlayer = getTemplate().isFakePlayer();
@@ -1359,13 +1360,15 @@ public class Npc extends Creature
 		broadcastInfo();
 	}
 	
-	/**
-	 * @return {@code true} if this Npc is registered in WalkingManager
-	 */
 	@Override
 	public boolean isWalker()
 	{
-		return WalkingManager.getInstance().isRegistered(this);
+		return _isWalker;
+	}
+	
+	public void setWalker()
+	{
+		_isWalker = true;
 	}
 	
 	@Override

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java

@@ -247,7 +247,7 @@ public class WalkingManager implements IXmlReader
 	 * @param npc NPC to check
 	 * @return {@code true} if given NPC controlled by Walking Manager.
 	 */
-	public boolean isRegistered(Npc npc)
+	private boolean isRegistered(Npc npc)
 	{
 		return _activeRoutes.containsKey(npc.getObjectId());
 	}
@@ -309,6 +309,7 @@ public class WalkingManager implements IXmlReader
 						walk.setWalkCheckTask(newTask); // start walk check task, for resuming walk after fight
 					}
 					
+					npc.setWalker();
 					_activeRoutes.put(npc.getObjectId(), walk); // register route
 				}
 				else

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java

@@ -126,6 +126,7 @@ public class Npc extends Creature
 	/** Support for random animation switching */
 	private boolean _isRandomAnimationEnabled = true;
 	private boolean _isRandomWalkingEnabled = true;
+	private boolean _isWalker = false;
 	private boolean _isTalkable = getTemplate().isTalkable();
 	private final boolean _isQuestMonster = getTemplate().isQuestMonster();
 	private final boolean _isFakePlayer = getTemplate().isFakePlayer();
@@ -1359,13 +1360,15 @@ public class Npc extends Creature
 		broadcastInfo();
 	}
 	
-	/**
-	 * @return {@code true} if this Npc is registered in WalkingManager
-	 */
 	@Override
 	public boolean isWalker()
 	{
-		return WalkingManager.getInstance().isRegistered(this);
+		return _isWalker;
+	}
+	
+	public void setWalker()
+	{
+		_isWalker = true;
 	}
 	
 	@Override

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java

@@ -247,7 +247,7 @@ public class WalkingManager implements IXmlReader
 	 * @param npc NPC to check
 	 * @return {@code true} if given NPC controlled by Walking Manager.
 	 */
-	public boolean isRegistered(Npc npc)
+	private boolean isRegistered(Npc npc)
 	{
 		return _activeRoutes.containsKey(npc.getObjectId());
 	}
@@ -309,6 +309,7 @@ public class WalkingManager implements IXmlReader
 						walk.setWalkCheckTask(newTask); // start walk check task, for resuming walk after fight
 					}
 					
+					npc.setWalker();
 					_activeRoutes.put(npc.getObjectId(), walk); // register route
 				}
 				else

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java

@@ -126,6 +126,7 @@ public class Npc extends Creature
 	/** Support for random animation switching */
 	private boolean _isRandomAnimationEnabled = true;
 	private boolean _isRandomWalkingEnabled = true;
+	private boolean _isWalker = false;
 	private boolean _isTalkable = getTemplate().isTalkable();
 	private final boolean _isQuestMonster = getTemplate().isQuestMonster();
 	private final boolean _isFakePlayer = getTemplate().isFakePlayer();
@@ -1359,13 +1360,15 @@ public class Npc extends Creature
 		broadcastInfo();
 	}
 	
-	/**
-	 * @return {@code true} if this Npc is registered in WalkingManager
-	 */
 	@Override
 	public boolean isWalker()
 	{
-		return WalkingManager.getInstance().isRegistered(this);
+		return _isWalker;
+	}
+	
+	public void setWalker()
+	{
+		_isWalker = true;
 	}
 	
 	@Override

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java

@@ -247,7 +247,7 @@ public class WalkingManager implements IXmlReader
 	 * @param npc NPC to check
 	 * @return {@code true} if given NPC controlled by Walking Manager.
 	 */
-	public boolean isRegistered(Npc npc)
+	private boolean isRegistered(Npc npc)
 	{
 		return _activeRoutes.containsKey(npc.getObjectId());
 	}
@@ -309,6 +309,7 @@ public class WalkingManager implements IXmlReader
 						walk.setWalkCheckTask(newTask); // start walk check task, for resuming walk after fight
 					}
 					
+					npc.setWalker();
 					_activeRoutes.put(npc.getObjectId(), walk); // register route
 				}
 				else

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java

@@ -127,6 +127,7 @@ public class Npc extends Creature
 	/** Support for random animation switching */
 	private boolean _isRandomAnimationEnabled = true;
 	private boolean _isRandomWalkingEnabled = true;
+	private boolean _isWalker = false;
 	private boolean _isTalkable = getTemplate().isTalkable();
 	private final boolean _isQuestMonster = getTemplate().isQuestMonster();
 	private final boolean _isFakePlayer = getTemplate().isFakePlayer();
@@ -1371,13 +1372,15 @@ public class Npc extends Creature
 		broadcastInfo();
 	}
 	
-	/**
-	 * @return {@code true} if this Npc is registered in WalkingManager
-	 */
 	@Override
 	public boolean isWalker()
 	{
-		return WalkingManager.getInstance().isRegistered(this);
+		return _isWalker;
+	}
+	
+	public void setWalker()
+	{
+		_isWalker = true;
 	}
 	
 	@Override

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java

@@ -247,7 +247,7 @@ public class WalkingManager implements IXmlReader
 	 * @param npc NPC to check
 	 * @return {@code true} if given NPC controlled by Walking Manager.
 	 */
-	public boolean isRegistered(Npc npc)
+	private boolean isRegistered(Npc npc)
 	{
 		return _activeRoutes.containsKey(npc.getObjectId());
 	}
@@ -309,6 +309,7 @@ public class WalkingManager implements IXmlReader
 						walk.setWalkCheckTask(newTask); // start walk check task, for resuming walk after fight
 					}
 					
+					npc.setWalker();
 					_activeRoutes.put(npc.getObjectId(), walk); // register route
 				}
 				else

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java

@@ -127,6 +127,7 @@ public class Npc extends Creature
 	/** Support for random animation switching */
 	private boolean _isRandomAnimationEnabled = true;
 	private boolean _isRandomWalkingEnabled = true;
+	private boolean _isWalker = false;
 	private boolean _isTalkable = getTemplate().isTalkable();
 	private final boolean _isQuestMonster = getTemplate().isQuestMonster();
 	private final boolean _isFakePlayer = getTemplate().isFakePlayer();
@@ -1371,13 +1372,15 @@ public class Npc extends Creature
 		broadcastInfo();
 	}
 	
-	/**
-	 * @return {@code true} if this Npc is registered in WalkingManager
-	 */
 	@Override
 	public boolean isWalker()
 	{
-		return WalkingManager.getInstance().isRegistered(this);
+		return _isWalker;
+	}
+	
+	public void setWalker()
+	{
+		_isWalker = true;
 	}
 	
 	@Override

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java

@@ -247,7 +247,7 @@ public class WalkingManager implements IXmlReader
 	 * @param npc NPC to check
 	 * @return {@code true} if given NPC controlled by Walking Manager.
 	 */
-	public boolean isRegistered(Npc npc)
+	private boolean isRegistered(Npc npc)
 	{
 		return _activeRoutes.containsKey(npc.getObjectId());
 	}
@@ -309,6 +309,7 @@ public class WalkingManager implements IXmlReader
 						walk.setWalkCheckTask(newTask); // start walk check task, for resuming walk after fight
 					}
 					
+					npc.setWalker();
 					_activeRoutes.put(npc.getObjectId(), walk); // register route
 				}
 				else

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java

@@ -127,6 +127,7 @@ public class Npc extends Creature
 	/** Support for random animation switching */
 	private boolean _isRandomAnimationEnabled = true;
 	private boolean _isRandomWalkingEnabled = true;
+	private boolean _isWalker = false;
 	private boolean _isTalkable = getTemplate().isTalkable();
 	private final boolean _isQuestMonster = getTemplate().isQuestMonster();
 	private final boolean _isFakePlayer = getTemplate().isFakePlayer();
@@ -1371,13 +1372,15 @@ public class Npc extends Creature
 		broadcastInfo();
 	}
 	
-	/**
-	 * @return {@code true} if this Npc is registered in WalkingManager
-	 */
 	@Override
 	public boolean isWalker()
 	{
-		return WalkingManager.getInstance().isRegistered(this);
+		return _isWalker;
+	}
+	
+	public void setWalker()
+	{
+		_isWalker = true;
 	}
 	
 	@Override

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/WalkingManager.java

@@ -247,7 +247,7 @@ public class WalkingManager implements IXmlReader
 	 * @param npc NPC to check
 	 * @return {@code true} if given NPC controlled by Walking Manager.
 	 */
-	public boolean isRegistered(Npc npc)
+	private boolean isRegistered(Npc npc)
 	{
 		return _activeRoutes.containsKey(npc.getObjectId());
 	}
@@ -309,6 +309,7 @@ public class WalkingManager implements IXmlReader
 						walk.setWalkCheckTask(newTask); // start walk check task, for resuming walk after fight
 					}
 					
+					npc.setWalker();
 					_activeRoutes.put(npc.getObjectId(), walk); // register route
 				}
 				else

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java

@@ -126,6 +126,7 @@ public class Npc extends Creature
 	/** Support for random animation switching */
 	private boolean _isRandomAnimationEnabled = true;
 	private boolean _isRandomWalkingEnabled = true;
+	private boolean _isWalker = false;
 	private boolean _isTalkable = getTemplate().isTalkable();
 	private final boolean _isQuestMonster = getTemplate().isQuestMonster();
 	private final boolean _isFakePlayer = getTemplate().isFakePlayer();
@@ -1359,13 +1360,15 @@ public class Npc extends Creature
 		broadcastInfo();
 	}
 	
-	/**
-	 * @return {@code true} if this Npc is registered in WalkingManager
-	 */
 	@Override
 	public boolean isWalker()
 	{
-		return WalkingManager.getInstance().isRegistered(this);
+		return _isWalker;
+	}
+	
+	public void setWalker()
+	{
+		_isWalker = true;
 	}
 	
 	@Override