Despawn precautions.

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java

@@ -495,7 +495,7 @@ public class AdminSpawn implements IAdminCommandHandler
 			SpawnTable.getInstance().addNewSpawn(spawn, permanent);
 			spawn.init();
 			
-			if (!permanent)
+			if (!permanent || (respawnTime <= 0))
 			{
 				spawn.stopRespawn();
 			}

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java

@@ -558,6 +558,10 @@ public class AdminTeleport implements IAdminCommandHandler
 				}
 				SpawnTable.getInstance().addNewSpawn(spawn, true);
 				spawn.init();
+				if (respawnTime <= 0)
+				{
+					spawn.stopRespawn();
+				}
 				
 				BuilderUtil.sendSysMessage(activeChar, "Created " + template1.getName() + " on " + target.getObjectId() + ".");
 			}

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java

@@ -133,6 +133,7 @@ public class DBSpawnManager
 					}
 					else
 					{
+						spawn.stopRespawn();
 						LOGGER.warning(getClass().getSimpleName() + ": Found database spawns without respawn for npc: " + template.getId() + " - " + template.getName() + " " + spawnTemplate);
 						continue;
 					}

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java

@@ -332,7 +332,7 @@ public final class SiegeGuardManager
 				if (spawn != null)
 				{
 					spawn.init();
-					if (isHired)
+					if (isHired || (spawn.getRespawnDelay() == 0))
 					{
 						spawn.stopRespawn();
 					}

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Spawn.java

@@ -291,7 +291,7 @@ public class L2Spawn extends Location implements IIdentifiable, INamable
 		{
 			doSpawn();
 		}
-		_doRespawn = _respawnMinDelay != 0;
+		_doRespawn = _respawnMinDelay > 0;
 		
 		return _currentCount;
 	}

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/entity/Castle.java

@@ -1191,6 +1191,7 @@ public final class Castle extends AbstractResidence
 				spawn.setXYZ(holder);
 				spawn.setHeading(holder.getHeading());
 				final L2Npc npc = spawn.doSpawn(false);
+				spawn.stopRespawn();
 				npc.broadcastInfo();
 				_sideNpcs.add(npc);
 			}

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java

@@ -495,7 +495,7 @@ public class AdminSpawn implements IAdminCommandHandler
 			SpawnTable.getInstance().addNewSpawn(spawn, permanent);
 			spawn.init();
 			
-			if (!permanent)
+			if (!permanent || (respawnTime <= 0))
 			{
 				spawn.stopRespawn();
 			}

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java

@@ -558,6 +558,10 @@ public class AdminTeleport implements IAdminCommandHandler
 				}
 				SpawnTable.getInstance().addNewSpawn(spawn, true);
 				spawn.init();
+				if (respawnTime <= 0)
+				{
+					spawn.stopRespawn();
+				}
 				
 				BuilderUtil.sendSysMessage(activeChar, "Created " + template1.getName() + " on " + target.getObjectId() + ".");
 			}

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java

@@ -133,6 +133,7 @@ public class DBSpawnManager
 					}
 					else
 					{
+						spawn.stopRespawn();
 						LOGGER.warning(getClass().getSimpleName() + ": Found database spawns without respawn for npc: " + template.getId() + " - " + template.getName() + " " + spawnTemplate);
 						continue;
 					}

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java

@@ -332,7 +332,7 @@ public final class SiegeGuardManager
 				if (spawn != null)
 				{
 					spawn.init();
-					if (isHired)
+					if (isHired || (spawn.getRespawnDelay() == 0))
 					{
 						spawn.stopRespawn();
 					}

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Spawn.java

@@ -291,7 +291,7 @@ public class L2Spawn extends Location implements IIdentifiable, INamable
 		{
 			doSpawn();
 		}
-		_doRespawn = _respawnMinDelay != 0;
+		_doRespawn = _respawnMinDelay > 0;
 		
 		return _currentCount;
 	}

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/entity/Castle.java

@@ -1191,6 +1191,7 @@ public final class Castle extends AbstractResidence
 				spawn.setXYZ(holder);
 				spawn.setHeading(holder.getHeading());
 				final L2Npc npc = spawn.doSpawn(false);
+				spawn.stopRespawn();
 				npc.broadcastInfo();
 				_sideNpcs.add(npc);
 			}

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java

@@ -495,7 +495,7 @@ public class AdminSpawn implements IAdminCommandHandler
 			SpawnTable.getInstance().addNewSpawn(spawn, permanent);
 			spawn.init();
 			
-			if (!permanent)
+			if (!permanent || (respawnTime <= 0))
 			{
 				spawn.stopRespawn();
 			}

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java

@@ -558,6 +558,10 @@ public class AdminTeleport implements IAdminCommandHandler
 				}
 				SpawnTable.getInstance().addNewSpawn(spawn, true);
 				spawn.init();
+				if (respawnTime <= 0)
+				{
+					spawn.stopRespawn();
+				}
 				
 				BuilderUtil.sendSysMessage(activeChar, "Created " + template1.getName() + " on " + target.getObjectId() + ".");
 			}

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java

@@ -133,6 +133,7 @@ public class DBSpawnManager
 					}
 					else
 					{
+						spawn.stopRespawn();
 						LOGGER.warning(getClass().getSimpleName() + ": Found database spawns without respawn for npc: " + template.getId() + " - " + template.getName() + " " + spawnTemplate);
 						continue;
 					}

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java

@@ -332,7 +332,7 @@ public final class SiegeGuardManager
 				if (spawn != null)
 				{
 					spawn.init();
-					if (isHired)
+					if (isHired || (spawn.getRespawnDelay() == 0))
 					{
 						spawn.stopRespawn();
 					}

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Spawn.java

@@ -291,7 +291,7 @@ public class L2Spawn extends Location implements IIdentifiable, INamable
 		{
 			doSpawn();
 		}
-		_doRespawn = _respawnMinDelay != 0;
+		_doRespawn = _respawnMinDelay > 0;
 		
 		return _currentCount;
 	}

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Castle.java

@@ -1191,6 +1191,7 @@ public final class Castle extends AbstractResidence
 				spawn.setXYZ(holder);
 				spawn.setHeading(holder.getHeading());
 				final L2Npc npc = spawn.doSpawn(false);
+				spawn.stopRespawn();
 				npc.broadcastInfo();
 				_sideNpcs.add(npc);
 			}

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java

@@ -495,7 +495,7 @@ public class AdminSpawn implements IAdminCommandHandler
 			SpawnTable.getInstance().addNewSpawn(spawn, permanent);
 			spawn.init();
 			
-			if (!permanent)
+			if (!permanent || (respawnTime <= 0))
 			{
 				spawn.stopRespawn();
 			}

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java

@@ -558,6 +558,10 @@ public class AdminTeleport implements IAdminCommandHandler
 				}
 				SpawnTable.getInstance().addNewSpawn(spawn, true);
 				spawn.init();
+				if (respawnTime <= 0)
+				{
+					spawn.stopRespawn();
+				}
 				
 				BuilderUtil.sendSysMessage(activeChar, "Created " + template1.getName() + " on " + target.getObjectId() + ".");
 			}

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java

@@ -133,6 +133,7 @@ public class DBSpawnManager
 					}
 					else
 					{
+						spawn.stopRespawn();
 						LOGGER.warning(getClass().getSimpleName() + ": Found database spawns without respawn for npc: " + template.getId() + " - " + template.getName() + " " + spawnTemplate);
 						continue;
 					}

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java

@@ -332,7 +332,7 @@ public final class SiegeGuardManager
 				if (spawn != null)
 				{
 					spawn.init();
-					if (isHired)
+					if (isHired || (spawn.getRespawnDelay() == 0))
 					{
 						spawn.stopRespawn();
 					}

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Spawn.java

@@ -291,7 +291,7 @@ public class L2Spawn extends Location implements IIdentifiable, INamable
 		{
 			doSpawn();
 		}
-		_doRespawn = _respawnMinDelay != 0;
+		_doRespawn = _respawnMinDelay > 0;
 		
 		return _currentCount;
 	}

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/entity/Castle.java

@@ -1191,6 +1191,7 @@ public final class Castle extends AbstractResidence
 				spawn.setXYZ(holder);
 				spawn.setHeading(holder.getHeading());
 				final L2Npc npc = spawn.doSpawn(false);
+				spawn.stopRespawn();
 				npc.broadcastInfo();
 				_sideNpcs.add(npc);
 			}

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java

@@ -495,7 +495,7 @@ public class AdminSpawn implements IAdminCommandHandler
 			SpawnTable.getInstance().addNewSpawn(spawn, permanent);
 			spawn.init();
 			
-			if (!permanent)
+			if (!permanent || (respawnTime <= 0))
 			{
 				spawn.stopRespawn();
 			}

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java

@@ -558,6 +558,10 @@ public class AdminTeleport implements IAdminCommandHandler
 				}
 				SpawnTable.getInstance().addNewSpawn(spawn, true);
 				spawn.init();
+				if (respawnTime <= 0)
+				{
+					spawn.stopRespawn();
+				}
 				
 				BuilderUtil.sendSysMessage(activeChar, "Created " + template1.getName() + " on " + target.getObjectId() + ".");
 			}

L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java

@@ -133,6 +133,7 @@ public class DBSpawnManager
 					}
 					else
 					{
+						spawn.stopRespawn();
 						LOGGER.warning(getClass().getSimpleName() + ": Found database spawns without respawn for npc: " + template.getId() + " - " + template.getName() + " " + spawnTemplate);
 						continue;
 					}

L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java

@@ -332,7 +332,7 @@ public final class SiegeGuardManager
 				if (spawn != null)
 				{
 					spawn.init();
-					if (isHired)
+					if (isHired || (spawn.getRespawnDelay() == 0))
 					{
 						spawn.stopRespawn();
 					}

L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/L2Spawn.java

@@ -291,7 +291,7 @@ public class L2Spawn extends Location implements IIdentifiable, INamable
 		{
 			doSpawn();
 		}
-		_doRespawn = _respawnMinDelay != 0;
+		_doRespawn = _respawnMinDelay > 0;
 		
 		return _currentCount;
 	}

L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/entity/Castle.java

@@ -1191,6 +1191,7 @@ public final class Castle extends AbstractResidence
 				spawn.setXYZ(holder);
 				spawn.setHeading(holder.getHeading());
 				final L2Npc npc = spawn.doSpawn(false);
+				spawn.stopRespawn();
 				npc.broadcastInfo();
 				_sideNpcs.add(npc);
 			}

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java

@@ -495,7 +495,7 @@ public class AdminSpawn implements IAdminCommandHandler
 			SpawnTable.getInstance().addNewSpawn(spawn, permanent);
 			spawn.init();
 			
-			if (!permanent)
+			if (!permanent || (respawnTime <= 0))
 			{
 				spawn.stopRespawn();
 			}

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java

@@ -558,6 +558,10 @@ public class AdminTeleport implements IAdminCommandHandler
 				}
 				SpawnTable.getInstance().addNewSpawn(spawn, true);
 				spawn.init();
+				if (respawnTime <= 0)
+				{
+					spawn.stopRespawn();
+				}
 				
 				BuilderUtil.sendSysMessage(activeChar, "Created " + template1.getName() + " on " + target.getObjectId() + ".");
 			}

L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java

@@ -133,6 +133,7 @@ public class DBSpawnManager
 					}
 					else
 					{
+						spawn.stopRespawn();
 						LOGGER.warning(getClass().getSimpleName() + ": Found database spawns without respawn for npc: " + template.getId() + " - " + template.getName() + " " + spawnTemplate);
 						continue;
 					}

L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java

@@ -332,7 +332,7 @@ public final class SiegeGuardManager
 				if (spawn != null)
 				{
 					spawn.init();
-					if (isHired)
+					if (isHired || (spawn.getRespawnDelay() == 0))
 					{
 						spawn.stopRespawn();
 					}

L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/L2Spawn.java

@@ -291,7 +291,7 @@ public class L2Spawn extends Location implements IIdentifiable, INamable
 		{
 			doSpawn();
 		}
-		_doRespawn = _respawnMinDelay != 0;
+		_doRespawn = _respawnMinDelay > 0;
 		
 		return _currentCount;
 	}

L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/entity/Castle.java

@@ -1191,6 +1191,7 @@ public final class Castle extends AbstractResidence
 				spawn.setXYZ(holder);
 				spawn.setHeading(holder.getHeading());
 				final L2Npc npc = spawn.doSpawn(false);
+				spawn.stopRespawn();
 				npc.broadcastInfo();
 				_sideNpcs.add(npc);
 			}

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/ForgeOfTheGods/TarBeetleSpawn.java

@@ -228,8 +228,8 @@ public class TarBeetleSpawn implements IGameXmlReader
 						final L2Spawn spawn = new L2Spawn(18804);
 						spawn.setHeading(Rnd.get(65535));
 						spawn.setXYZ(location.getX(), location.getY(), GeoEngine.getInstance().getHeight(location.getX(), location.getY(), location.getZ()));
-						
 						final L2Npc npc = spawn.doSpawn();
+						spawn.stopRespawn();
 						npc.setRandomWalking(false);
 						npc.setIsImmobilized(true);
 						npc.setIsInvul(true);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java

@@ -489,7 +489,7 @@ public class AdminSpawn implements IAdminCommandHandler
 					SpawnTable.getInstance().addNewSpawn(spawn, permanent);
 					spawn.init();
 				}
-				if (!permanent)
+				if (!permanent || (respawnTime <= 0))
 				{
 					spawn.stopRespawn();
 				}

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java

@@ -562,6 +562,10 @@ public class AdminTeleport implements IAdminCommandHandler
 				}
 				SpawnTable.getInstance().addNewSpawn(spawn, true);
 				spawn.init();
+				if (respawnTime <= 0)
+				{
+					spawn.stopRespawn();
+				}
 				
 				BuilderUtil.sendSysMessage(activeChar, "Created " + target.getTemplate().getName() + " on " + target.getObjectId() + ".");
 			}

L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java

@@ -160,6 +160,10 @@ public final class SiegeGuardManager
 							return;
 						}
 					}
+					else if (spawn.getRespawnDelay() == 0)
+					{
+						spawn.stopRespawn();
+					}
 				}
 			}
 		}

L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java

@@ -464,7 +464,6 @@ public class AutoSpawnHandler
 				if (spawnInst._spawnCount == 1)
 				{
 					npcInst = newSpawn.doSpawn();
-					newSpawn.stopRespawn(); // Just in case...
 					npcInst.setXYZ(npcInst.getX(), npcInst.getY(), npcInst.getZ());
 					spawnInst.addNpcInstance(npcInst);
 				}
@@ -481,12 +480,13 @@ public class AutoSpawnHandler
 						spawnInst.addNpcInstance(npcInst);
 					}
 				}
+				newSpawn.stopRespawn();
 				
 				if (npcInst != null)
 				{
 					if (spawnInst.isRandomSpawn())
 					{
-						while (!L2World.getInstance().getVisibleObjectsInRange(npcInst, L2Npc.class, 10).isEmpty())
+						while (!L2World.getInstance().getVisibleObjectsInRange(npcInst, L2Npc.class, 5).isEmpty())
 						{
 							// LOGGER.log(Level.INFO, "AutoSpawnHandler: Random spawn location " + npcInst.getLocation() + " for " + npcInst + " is occupied. Teleporting...");
 							npcInst.teleToLocation(locationList[Rnd.get(locationList.length)]);

L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Spawn.java

@@ -286,7 +286,7 @@ public class L2Spawn extends Location implements IIdentifiable, INamable
 		{
 			doSpawn();
 		}
-		_doRespawn = _respawnMinDelay != 0;
+		_doRespawn = _respawnMinDelay > 0;
 		
 		return _currentCount;
 	}

L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java

@@ -174,6 +174,10 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
 		for (L2Spawn guard : _guards)
 		{
 			guard.init();
+			if (guard.getRespawnDelay() == 0)
+			{
+				guard.stopRespawn();
+			}
 		}
 	}
 	

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java

@@ -495,7 +495,7 @@ public class AdminSpawn implements IAdminCommandHandler
 			SpawnTable.getInstance().addNewSpawn(spawn, permanent);
 			spawn.init();
 			
-			if (!permanent)
+			if (!permanent || (respawnTime <= 0))
 			{
 				spawn.stopRespawn();
 			}

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java

@@ -558,6 +558,10 @@ public class AdminTeleport implements IAdminCommandHandler
 				}
 				SpawnTable.getInstance().addNewSpawn(spawn, true);
 				spawn.init();
+				if (respawnTime <= 0)
+				{
+					spawn.stopRespawn();
+				}
 				
 				BuilderUtil.sendSysMessage(activeChar, "Created " + template1.getName() + " on " + target.getObjectId() + ".");
 			}

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java

@@ -133,6 +133,7 @@ public class DBSpawnManager
 					}
 					else
 					{
+						spawn.stopRespawn();
 						LOGGER.warning(getClass().getSimpleName() + ": Found database spawns without respawn for npc: " + template.getId() + " - " + template.getName() + " " + spawnTemplate);
 						continue;
 					}

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java

@@ -332,7 +332,7 @@ public final class SiegeGuardManager
 				if (spawn != null)
 				{
 					spawn.init();
-					if (isHired)
+					if (isHired || (spawn.getRespawnDelay() == 0))
 					{
 						spawn.stopRespawn();
 					}

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Spawn.java

@@ -291,7 +291,7 @@ public class L2Spawn extends Location implements IIdentifiable, INamable
 		{
 			doSpawn();
 		}
-		_doRespawn = _respawnMinDelay != 0;
+		_doRespawn = _respawnMinDelay > 0;
 		
 		return _currentCount;
 	}

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/entity/Castle.java

@@ -1190,6 +1190,7 @@ public final class Castle extends AbstractResidence
 				spawn.setXYZ(holder);
 				spawn.setHeading(holder.getHeading());
 				final L2Npc npc = spawn.doSpawn(false);
+				spawn.stopRespawn();
 				npc.broadcastInfo();
 				_sideNpcs.add(npc);
 			}

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java

@@ -495,7 +495,7 @@ public class AdminSpawn implements IAdminCommandHandler
 			SpawnTable.getInstance().addNewSpawn(spawn, permanent);
 			spawn.init();
 			
-			if (!permanent)
+			if (!permanent || (respawnTime <= 0))
 			{
 				spawn.stopRespawn();
 			}

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java

@@ -558,6 +558,10 @@ public class AdminTeleport implements IAdminCommandHandler
 				}
 				SpawnTable.getInstance().addNewSpawn(spawn, true);
 				spawn.init();
+				if (respawnTime <= 0)
+				{
+					spawn.stopRespawn();
+				}
 				
 				BuilderUtil.sendSysMessage(activeChar, "Created " + template1.getName() + " on " + target.getObjectId() + ".");
 			}

L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java

@@ -133,6 +133,7 @@ public class DBSpawnManager
 					}
 					else
 					{
+						spawn.stopRespawn();
 						LOGGER.warning(getClass().getSimpleName() + ": Found database spawns without respawn for npc: " + template.getId() + " - " + template.getName() + " " + spawnTemplate);
 						continue;
 					}

L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java

@@ -332,7 +332,7 @@ public final class SiegeGuardManager
 				if (spawn != null)
 				{
 					spawn.init();
-					if (isHired)
+					if (isHired || (spawn.getRespawnDelay() == 0))
 					{
 						spawn.stopRespawn();
 					}

L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Spawn.java

@@ -291,7 +291,7 @@ public class L2Spawn extends Location implements IIdentifiable, INamable
 		{
 			doSpawn();
 		}
-		_doRespawn = _respawnMinDelay != 0;
+		_doRespawn = _respawnMinDelay > 0;
 		
 		return _currentCount;
 	}

L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/entity/Castle.java

@@ -1190,6 +1190,7 @@ public final class Castle extends AbstractResidence
 				spawn.setXYZ(holder);
 				spawn.setHeading(holder.getHeading());
 				final L2Npc npc = spawn.doSpawn(false);
+				spawn.stopRespawn();
 				npc.broadcastInfo();
 				_sideNpcs.add(npc);
 			}

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java

@@ -495,7 +495,7 @@ public class AdminSpawn implements IAdminCommandHandler
 			SpawnTable.getInstance().addNewSpawn(spawn, permanent);
 			spawn.init();
 			
-			if (!permanent)
+			if (!permanent || (respawnTime <= 0))
 			{
 				spawn.stopRespawn();
 			}

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java

@@ -558,6 +558,10 @@ public class AdminTeleport implements IAdminCommandHandler
 				}
 				SpawnTable.getInstance().addNewSpawn(spawn, true);
 				spawn.init();
+				if (respawnTime <= 0)
+				{
+					spawn.stopRespawn();
+				}
 				
 				BuilderUtil.sendSysMessage(activeChar, "Created " + template1.getName() + " on " + target.getObjectId() + ".");
 			}

L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java

@@ -133,6 +133,7 @@ public class DBSpawnManager
 					}
 					else
 					{
+						spawn.stopRespawn();
 						LOGGER.warning(getClass().getSimpleName() + ": Found database spawns without respawn for npc: " + template.getId() + " - " + template.getName() + " " + spawnTemplate);
 						continue;
 					}

L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java

@@ -332,7 +332,7 @@ public final class SiegeGuardManager
 				if (spawn != null)
 				{
 					spawn.init();
-					if (isHired)
+					if (isHired || (spawn.getRespawnDelay() == 0))
 					{
 						spawn.stopRespawn();
 					}

L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Spawn.java

@@ -291,7 +291,7 @@ public class L2Spawn extends Location implements IIdentifiable, INamable
 		{
 			doSpawn();
 		}
-		_doRespawn = _respawnMinDelay != 0;
+		_doRespawn = _respawnMinDelay > 0;
 		
 		return _currentCount;
 	}

L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/entity/Castle.java

@@ -1190,6 +1190,7 @@ public final class Castle extends AbstractResidence
 				spawn.setXYZ(holder);
 				spawn.setHeading(holder.getHeading());
 				final L2Npc npc = spawn.doSpawn(false);
+				spawn.stopRespawn();
 				npc.broadcastInfo();
 				_sideNpcs.add(npc);
 			}

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java

@@ -495,7 +495,7 @@ public class AdminSpawn implements IAdminCommandHandler
 			SpawnTable.getInstance().addNewSpawn(spawn, permanent);
 			spawn.init();
 			
-			if (!permanent)
+			if (!permanent || (respawnTime <= 0))
 			{
 				spawn.stopRespawn();
 			}

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java

@@ -558,6 +558,10 @@ public class AdminTeleport implements IAdminCommandHandler
 				}
 				SpawnTable.getInstance().addNewSpawn(spawn, true);
 				spawn.init();
+				if (respawnTime <= 0)
+				{
+					spawn.stopRespawn();
+				}
 				
 				BuilderUtil.sendSysMessage(activeChar, "Created " + template1.getName() + " on " + target.getObjectId() + ".");
 			}

L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java

@@ -133,6 +133,7 @@ public class DBSpawnManager
 					}
 					else
 					{
+						spawn.stopRespawn();
 						LOGGER.warning(getClass().getSimpleName() + ": Found database spawns without respawn for npc: " + template.getId() + " - " + template.getName() + " " + spawnTemplate);
 						continue;
 					}

L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java

@@ -332,7 +332,7 @@ public final class SiegeGuardManager
 				if (spawn != null)
 				{
 					spawn.init();
-					if (isHired)
+					if (isHired || (spawn.getRespawnDelay() == 0))
 					{
 						spawn.stopRespawn();
 					}

L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/L2Spawn.java

@@ -291,7 +291,7 @@ public class L2Spawn extends Location implements IIdentifiable, INamable
 		{
 			doSpawn();
 		}
-		_doRespawn = _respawnMinDelay != 0;
+		_doRespawn = _respawnMinDelay > 0;
 		
 		return _currentCount;
 	}

L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/entity/Castle.java

@@ -1190,6 +1190,7 @@ public final class Castle extends AbstractResidence
 				spawn.setXYZ(holder);
 				spawn.setHeading(holder.getHeading());
 				final L2Npc npc = spawn.doSpawn(false);
+				spawn.stopRespawn();
 				npc.broadcastInfo();
 				_sideNpcs.add(npc);
 			}