Force some spawns managed out of Spawn class.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1486,7 +1486,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1507,7 +1507,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1486,7 +1486,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1507,7 +1507,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1486,7 +1486,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1507,7 +1507,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1486,7 +1486,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1507,7 +1507,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1486,7 +1486,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1507,7 +1507,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1486,7 +1486,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1507,7 +1507,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1486,7 +1486,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1507,7 +1507,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1489,7 +1489,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1510,7 +1510,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1486,7 +1486,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1507,7 +1507,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1486,7 +1486,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1507,7 +1507,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1486,7 +1486,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1507,7 +1507,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java

@@ -305,7 +305,7 @@ public class TerritoryWarSuperClass extends Quest
 					{
 						if (wardSpawn.getId() == ward.getTerritoryId())
 						{
-							wardSpawn.setNPC(wardSpawn.getNpc().getSpawn().doSpawn());
+							wardSpawn.setNPC(wardSpawn.getNpc().getSpawn().doSpawn(false));
 							ward.unSpawnMe();
 							ward.setNpc(wardSpawn.getNpc());
 						}

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

@@ -54,7 +54,7 @@ public class FortSiegeGuardManager
 			{
 				for (Spawn spawnDat : monsterList)
 				{
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					if (spawnDat.getRespawnDelay() == 0)
 					{
 						spawnDat.stopRespawn();

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

@@ -303,7 +303,7 @@ public class FourSepulchersManager
 				}
 				_managers.add(spawnDat);
 				SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.startRespawn();
 				LOGGER.info(getClass().getSimpleName() + ": spawned " + spawnDat.getTemplate().getName());
 			}
@@ -1111,7 +1111,7 @@ public class FourSepulchersManager
 			}
 			else
 			{
-				mob = (SepulcherMonster) spawnDat.doSpawn();
+				mob = (SepulcherMonster) spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 			}
 			
@@ -1228,7 +1228,7 @@ public class FourSepulchersManager
 			spawnDat.setXYZ(activeChar);
 			spawnDat.setHeading(activeChar.getHeading());
 			spawnDat.setRespawnDelay(3600);
-			_allMobs.add(spawnDat.doSpawn());
+			_allMobs.add(spawnDat.doSpawn(false));
 			spawnDat.stopRespawn();
 		}
 	}
@@ -1272,7 +1272,7 @@ public class FourSepulchersManager
 		{
 			for (Spawn spawnDat : monsterList)
 			{
-				_allMobs.add(spawnDat.doSpawn());
+				_allMobs.add(spawnDat.doSpawn(false));
 				spawnDat.stopRespawn();
 			}
 		}
@@ -1309,7 +1309,7 @@ public class FourSepulchersManager
 		final Spawn spawnDat = _shadowSpawns.get(npcId);
 		if (spawnDat != null)
 		{
-			final SepulcherMonster mob = (SepulcherMonster) spawnDat.doSpawn();
+			final SepulcherMonster mob = (SepulcherMonster) spawnDat.doSpawn(false);
 			spawnDat.stopRespawn();
 			
 			if (mob != null)

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

@@ -557,7 +557,7 @@ public class TerritoryWarManager implements Siegable
 						{
 							if (wardSpawn.getId() == twWard.getTerritoryId())
 							{
-								wardSpawn.setNPC(wardSpawn.getNpc().getSpawn().doSpawn());
+								wardSpawn.setNPC(wardSpawn.getNpc().getSpawn().doSpawn(false));
 								twWard.unSpawnMe();
 								twWard.setNpc(wardSpawn.getNpc());
 							}
@@ -970,7 +970,7 @@ public class TerritoryWarManager implements Siegable
 				{
 					if (!ward.getNpc().isSpawned())
 					{
-						ward.setNPC(ward.getNpc().getSpawn().doSpawn());
+						ward.setNPC(ward.getNpc().getSpawn().doSpawn(false));
 					}
 					_territoryWards.add(new TerritoryWard(ward.getId(), ward.getLocation().getX(), ward.getLocation().getY(), ward.getLocation().getZ(), 0, ward.getId() + 13479, t.getCastleId(), ward.getNpc()));
 				}
@@ -1072,7 +1072,7 @@ public class TerritoryWarManager implements Siegable
 					{
 						if (!ward.getNpc().isSpawned() && SPAWN_WARDS_WHEN_TW_IS_NOT_IN_PROGRESS)
 						{
-							ward.setNPC(ward.getNpc().getSpawn().doSpawn());
+							ward.setNPC(ward.getNpc().getSpawn().doSpawn(false));
 						}
 						else if (ward.getNpc().isSpawned() && !SPAWN_WARDS_WHEN_TW_IS_NOT_IN_PROGRESS)
 						{

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/DimensionalRiftRoom.java

@@ -114,7 +114,7 @@ public class DimensionalRiftRoom
 	{
 		for (Spawn spawn : _roomSpawns)
 		{
-			spawn.doSpawn();
+			spawn.doSpawn(false);
 			spawn.startRespawn();
 		}
 	}

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java

@@ -433,7 +433,7 @@ public class Instance
 					spawnDat.setRespawnDelay(set.getInt("respawn"), set.getInt("respawnRandom"));
 					spawnDat.setInstanceId(_id);
 					spawnDat.setRandomWalking(set.getBoolean("allowRandomWalk"));
-					final Npc spawned = spawnDat.doSpawn();
+					final Npc spawned = spawnDat.doSpawn(false);
 					if ((set.getInt("delay") >= 0) && spawned.isAttackable())
 					{
 						((Attackable) spawned).setOnKillDelay(set.getInt("delay"));

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1073,11 +1073,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1100,7 +1100,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1118,7 +1118,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1140,7 +1140,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1099,7 +1099,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1456,7 +1456,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 			catch (Exception e)
 			{
@@ -1477,7 +1477,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java

@@ -305,7 +305,7 @@ public class TerritoryWarSuperClass extends Quest
 					{
 						if (wardSpawn.getId() == ward.getTerritoryId())
 						{
-							wardSpawn.setNPC(wardSpawn.getNpc().getSpawn().doSpawn());
+							wardSpawn.setNPC(wardSpawn.getNpc().getSpawn().doSpawn(false));
 							ward.unSpawnMe();
 							ward.setNpc(wardSpawn.getNpc());
 						}

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

@@ -54,7 +54,7 @@ public class FortSiegeGuardManager
 			{
 				for (Spawn spawnDat : monsterList)
 				{
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					if (spawnDat.getRespawnDelay() == 0)
 					{
 						spawnDat.stopRespawn();

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

@@ -303,7 +303,7 @@ public class FourSepulchersManager
 				}
 				_managers.add(spawnDat);
 				SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.startRespawn();
 				LOGGER.info(getClass().getSimpleName() + ": spawned " + spawnDat.getTemplate().getName());
 			}
@@ -1111,7 +1111,7 @@ public class FourSepulchersManager
 			}
 			else
 			{
-				mob = (SepulcherMonster) spawnDat.doSpawn();
+				mob = (SepulcherMonster) spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 			}
 			
@@ -1228,7 +1228,7 @@ public class FourSepulchersManager
 			spawnDat.setXYZ(activeChar);
 			spawnDat.setHeading(activeChar.getHeading());
 			spawnDat.setRespawnDelay(3600);
-			_allMobs.add(spawnDat.doSpawn());
+			_allMobs.add(spawnDat.doSpawn(false));
 			spawnDat.stopRespawn();
 		}
 	}
@@ -1272,7 +1272,7 @@ public class FourSepulchersManager
 		{
 			for (Spawn spawnDat : monsterList)
 			{
-				_allMobs.add(spawnDat.doSpawn());
+				_allMobs.add(spawnDat.doSpawn(false));
 				spawnDat.stopRespawn();
 			}
 		}
@@ -1309,7 +1309,7 @@ public class FourSepulchersManager
 		final Spawn spawnDat = _shadowSpawns.get(npcId);
 		if (spawnDat != null)
 		{
-			final SepulcherMonster mob = (SepulcherMonster) spawnDat.doSpawn();
+			final SepulcherMonster mob = (SepulcherMonster) spawnDat.doSpawn(false);
 			spawnDat.stopRespawn();
 			
 			if (mob != null)

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

@@ -557,7 +557,7 @@ public class TerritoryWarManager implements Siegable
 						{
 							if (wardSpawn.getId() == twWard.getTerritoryId())
 							{
-								wardSpawn.setNPC(wardSpawn.getNpc().getSpawn().doSpawn());
+								wardSpawn.setNPC(wardSpawn.getNpc().getSpawn().doSpawn(false));
 								twWard.unSpawnMe();
 								twWard.setNpc(wardSpawn.getNpc());
 							}
@@ -970,7 +970,7 @@ public class TerritoryWarManager implements Siegable
 				{
 					if (!ward.getNpc().isSpawned())
 					{
-						ward.setNPC(ward.getNpc().getSpawn().doSpawn());
+						ward.setNPC(ward.getNpc().getSpawn().doSpawn(false));
 					}
 					_territoryWards.add(new TerritoryWard(ward.getId(), ward.getLocation().getX(), ward.getLocation().getY(), ward.getLocation().getZ(), 0, ward.getId() + 13479, t.getCastleId(), ward.getNpc()));
 				}
@@ -1072,7 +1072,7 @@ public class TerritoryWarManager implements Siegable
 					{
 						if (!ward.getNpc().isSpawned() && SPAWN_WARDS_WHEN_TW_IS_NOT_IN_PROGRESS)
 						{
-							ward.setNPC(ward.getNpc().getSpawn().doSpawn());
+							ward.setNPC(ward.getNpc().getSpawn().doSpawn(false));
 						}
 						else if (ward.getNpc().isSpawned() && !SPAWN_WARDS_WHEN_TW_IS_NOT_IN_PROGRESS)
 						{

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/DimensionalRiftRoom.java

@@ -114,7 +114,7 @@ public class DimensionalRiftRoom
 	{
 		for (Spawn spawn : _roomSpawns)
 		{
-			spawn.doSpawn();
+			spawn.doSpawn(false);
 			spawn.startRespawn();
 		}
 	}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java

@@ -433,7 +433,7 @@ public class Instance
 					spawnDat.setRespawnDelay(set.getInt("respawn"), set.getInt("respawnRandom"));
 					spawnDat.setInstanceId(_id);
 					spawnDat.setRandomWalking(set.getBoolean("allowRandomWalk"));
-					final Npc spawned = spawnDat.doSpawn();
+					final Npc spawned = spawnDat.doSpawn(false);
 					if ((set.getInt("delay") >= 0) && spawned.isAttackable())
 					{
 						((Attackable) spawned).setOnKillDelay(set.getInt("delay"));

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1073,11 +1073,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1100,7 +1100,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1118,7 +1118,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1140,7 +1140,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1099,7 +1099,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1456,7 +1456,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 			catch (Exception e)
 			{
@@ -1477,7 +1477,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1491,7 +1491,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1512,7 +1512,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1491,7 +1491,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1512,7 +1512,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1491,7 +1491,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1512,7 +1512,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1491,7 +1491,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1512,7 +1512,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1491,7 +1491,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1512,7 +1512,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1491,7 +1491,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1512,7 +1512,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1486,7 +1486,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1507,7 +1507,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1491,7 +1491,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1512,7 +1512,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1491,7 +1491,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1512,7 +1512,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);

L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Fort.java

@@ -1080,11 +1080,11 @@ public class Fort extends AbstractResidence
 		{
 			return;
 		}
+		
 		_isSuspiciousMerchantSpawned = true;
-		initSiegeNpcs();
 		for (Spawn spawnDat : _siegeNpcs)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1107,7 +1107,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _npcCommanders)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1125,7 +1125,7 @@ public class Fort extends AbstractResidence
 	{
 		for (Spawn spawnDat : _specialEnvoys)
 		{
-			spawnDat.doSpawn();
+			spawnDat.doSpawn(false);
 			spawnDat.startRespawn();
 		}
 	}
@@ -1147,7 +1147,7 @@ public class Fort extends AbstractResidence
 					spawnDat.setHeading(rs.getInt("heading"));
 					spawnDat.setRespawnDelay(60);
 					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
-					spawnDat.doSpawn();
+					spawnDat.doSpawn(false);
 					spawnDat.startRespawn();
 				}
 			}

L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/FortSiege.java

@@ -1097,7 +1097,7 @@ public class FortSiege implements Siegable
 				spawnDat.setXYZ(_sp.getLocation());
 				spawnDat.setHeading(_sp.getLocation().getHeading());
 				spawnDat.setRespawnDelay(60);
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				spawnDat.stopRespawn();
 				_commanders.add(spawnDat);
 			}
@@ -1168,7 +1168,7 @@ public class FortSiege implements Siegable
 		{
 			for (Spawn spawnDat : _siegeGuards)
 			{
-				spawnDat.doSpawn();
+				spawnDat.doSpawn(false);
 				if (spawnDat.getRespawnDelay() == 0)
 				{
 					spawnDat.stopRespawn();

L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Siege.java

@@ -1491,7 +1491,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				_controlTowers.add((ControlTower) spawn.doSpawn());
+				_controlTowers.add((ControlTower) spawn.doSpawn(false));
 			}
 		}
 		catch (Exception e)
@@ -1512,7 +1512,7 @@ public class Siege implements Siegable
 			{
 				final Spawn spawn = new Spawn(ts.getId());
 				spawn.setLocation(ts.getLocation());
-				final FlameTower tower = (FlameTower) spawn.doSpawn();
+				final FlameTower tower = (FlameTower) spawn.doSpawn(false);
 				tower.setUpgradeLevel(ts.getUpgradeLevel());
 				tower.setZoneList(ts.getZoneList());
 				_flameTowers.add(tower);