Despawn precautions.
This commit is contained in:
@@ -495,7 +495,7 @@ public class AdminSpawn implements IAdminCommandHandler
|
||||
SpawnTable.getInstance().addNewSpawn(spawn, permanent);
|
||||
spawn.init();
|
||||
|
||||
if (!permanent)
|
||||
if (!permanent || (respawnTime <= 0))
|
||||
{
|
||||
spawn.stopRespawn();
|
||||
}
|
||||
|
@@ -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() + ".");
|
||||
}
|
||||
|
@@ -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;
|
||||
}
|
||||
|
@@ -332,7 +332,7 @@ public final class SiegeGuardManager
|
||||
if (spawn != null)
|
||||
{
|
||||
spawn.init();
|
||||
if (isHired)
|
||||
if (isHired || (spawn.getRespawnDelay() == 0))
|
||||
{
|
||||
spawn.stopRespawn();
|
||||
}
|
||||
|
@@ -291,7 +291,7 @@ public class L2Spawn extends Location implements IIdentifiable, INamable
|
||||
{
|
||||
doSpawn();
|
||||
}
|
||||
_doRespawn = _respawnMinDelay != 0;
|
||||
_doRespawn = _respawnMinDelay > 0;
|
||||
|
||||
return _currentCount;
|
||||
}
|
||||
|
@@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user