lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Despawn precautions.

Browse Source
This commit is contained in:
MobiusDev
2019-01-09 07:20:24 +00:00
parent 066996efbb
commit 592399f5c0
67 changed files with 107 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java vendored
View File

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

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java vendored
View File

@@ -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() + ".");
}

1
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -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;
}

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java
View File

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

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Spawn.java
View File

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

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

@@ -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);
}