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

Force some spawns managed out of Spawn class.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-01-09 02:02:18 +00:00
parent c4a6c3b8a1
commit 9c068db77f
81 changed files with 229 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java vendored
View File

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

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortSiegeGuardManager.java
View File

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

10
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java
View File

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

6
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java
View File

@@ -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)
{

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/DimensionalRiftRoom.java
View File

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

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

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

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

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

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

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

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

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