Fixed monster drift parameters.

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_01.0_Ertheia/dist/game/data/spawns/Rune/ChapelGuards.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="ChapelGuards">
+	<spawn name="ChapelGuards" ai="NoRandomActivity">
 		<parameters>
 			<param name="disableRandomWalk" value="true" />
 		</parameters>

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_02.5_Underground/dist/game/data/spawns/Rune/ChapelGuards.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="ChapelGuards">
+	<spawn name="ChapelGuards" ai="NoRandomActivity">
 		<parameters>
 			<param name="disableRandomWalk" value="true" />
 		</parameters>

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_03.0_Helios/dist/game/data/spawns/Rune/ChapelGuards.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="ChapelGuards">
+	<spawn name="ChapelGuards" ai="NoRandomActivity">
 		<parameters>
 			<param name="disableRandomWalk" value="true" />
 		</parameters>

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_04.0_GrandCrusade/dist/game/data/spawns/Rune/ChapelGuards.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="ChapelGuards">
+	<spawn name="ChapelGuards" ai="NoRandomActivity">
 		<parameters>
 			<param name="disableRandomWalk" value="true" />
 		</parameters>

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_05.0_Salvation/dist/game/data/spawns/Rune/ChapelGuards.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="ChapelGuards">
+	<spawn name="ChapelGuards" ai="NoRandomActivity">
 		<parameters>
 			<param name="disableRandomWalk" value="true" />
 		</parameters>

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_05.5_EtinasFate/dist/game/data/spawns/Rune/ChapelGuards.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="ChapelGuards">
+	<spawn name="ChapelGuards" ai="NoRandomActivity">
 		<parameters>
 			<param name="disableRandomWalk" value="true" />
 		</parameters>

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_06.0_Fafurion/dist/game/data/spawns/Rune/ChapelGuards.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="ChapelGuards">
+	<spawn name="ChapelGuards" ai="NoRandomActivity">
 		<parameters>
 			<param name="disableRandomWalk" value="true" />
 		</parameters>

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/spawns/Rune/ChapelGuards.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="ChapelGuards">
+	<spawn name="ChapelGuards" ai="NoRandomActivity">
 		<parameters>
 			<param name="disableRandomWalk" value="true" />
 		</parameters>

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/Rune/ChapelGuards.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="ChapelGuards">
+	<spawn name="ChapelGuards" ai="NoRandomActivity">
 		<parameters>
 			<param name="disableRandomWalk" value="true" />
 		</parameters>

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/Rune/ChapelGuards.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="ChapelGuards">
+	<spawn name="ChapelGuards" ai="NoRandomActivity">
 		<parameters>
 			<param name="disableRandomWalk" value="true" />
 		</parameters>

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Rune/ChapelGuards.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="ChapelGuards">
+	<spawn name="ChapelGuards" ai="NoRandomActivity">
 		<parameters>
 			<param name="disableRandomWalk" value="true" />
 		</parameters>

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_10.3_MasterClass/dist/game/data/spawns/Rune/ChapelGuards.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="ChapelGuards">
+	<spawn name="ChapelGuards" ai="NoRandomActivity">
 		<parameters>
 			<param name="disableRandomWalk" value="true" />
 		</parameters>

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_Classic_1.0/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Rune/ChapelGuards.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="ChapelGuards">
+	<spawn name="ChapelGuards" ai="NoRandomActivity">
 		<parameters>
 			<param name="disableRandomWalk" value="true" />
 		</parameters>

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}
 		

L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/ai/others/Spawns/NoRandomActivity.java

@@ -34,11 +34,12 @@ public class NoRandomActivity extends AbstractNpcAI
 	@Override
 	public void onSpawnNpc(SpawnTemplate template, SpawnGroup group, Npc npc)
 	{
-		npc.setRandomAnimation(npc.getParameters().getBoolean("disableRandomAnimation", false));
+		npc.setRandomAnimation(!template.getParameters().getBoolean("disableRandomAnimation", false));
-		npc.setRandomWalking(npc.getParameters().getBoolean("disableRandomWalk", false));
+		final boolean randomWalk = !template.getParameters().getBoolean("disableRandomWalk", false);
-		if (npc.getSpawn() != null)
+		npc.setRandomWalking(randomWalk);
+		if ((npc.getSpawn() != null))
 		{
-			npc.getSpawn().setRandomWalking(!npc.getParameters().getBoolean("disableRandomWalk", false));
+			npc.getSpawn().setRandomWalking(randomWalk);
 		}
 	}
 	

L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -550,7 +550,7 @@ public class AttackableAI extends CreatureAI
 			}
 		}
 		// Order to the Monster to random walk (1/100)
-		else if ((npc.getSpawn() != null) && npc.getSpawn().getRandomWalking() && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
+		else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
 		{
 			for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
 			{

L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/SpawnData.java

@@ -218,25 +218,32 @@ public class SpawnData implements IXmlReader
 		SpawnGroup defaultGroup = null;
 		for (Node innerNode = spawnsNode.getFirstChild(); innerNode != null; innerNode = innerNode.getNextSibling())
 		{
-			if ("territories".equalsIgnoreCase(innerNode.getNodeName()))
+			switch (innerNode.getNodeName())
 			{
-				parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+				case "territories":
-			}
-			else if ("group".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseGroup(innerNode, spawnTemplate);
-			}
-			else if ("npc".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				if (defaultGroup == null)
 				{
-					defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					parseTerritories(innerNode, spawnTemplate.getFile(), spawnTemplate);
+					break;
+				}
+				case "group":
+				{
+					parseGroup(innerNode, spawnTemplate);
+					break;
+				}
+				case "npc":
+				{
+					if (defaultGroup == null)
+					{
+						defaultGroup = new SpawnGroup(StatSet.EMPTY_STATSET);
+					}
+					parseNpc(innerNode, spawnTemplate, defaultGroup);
+					break;
+				}
+				case "parameters":
+				{
+					parseParameters(innerNode, spawnTemplate);
+					break;
 				}
-				parseNpc(innerNode, spawnTemplate, defaultGroup);
-			}
-			else if ("parameters".equalsIgnoreCase(innerNode.getNodeName()))
-			{
-				parseParameters(spawnsNode, spawnTemplate);
 			}
 		}