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

Fixed DBSpawnManager RespawnPattern NPE.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-08-13 14:54:01 +00:00
parent b97904d662
commit 6c750f59ae
50 changed files with 400 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else

11
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD); npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern(); final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay; final int respawnMinDelay;
long respawnTime; final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null) if (respawnPattern != null)
{ {
respawnTime = respawnPattern.next(System.currentTimeMillis()); respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis()); respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
} }
else else
{ {

11
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/spawns/NpcSpawnTemplate.java
View File

@@ -95,7 +95,8 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
_count = set.getInt("count", 1); _count = set.getInt("count", 1);
_respawnTime = set.getDuration("respawnTime", null); _respawnTime = set.getDuration("respawnTime", null);
_respawnTimeRandom = set.getDuration("respawnRandom", null); _respawnTimeRandom = set.getDuration("respawnRandom", null);
_respawnPattern = (set.getString("respawnPattern", null) == null) || set.getString("respawnPattern", null).isEmpty() ? null : new SchedulingPattern(set.getString("respawnPattern", null)); final String pattern = set.getString("respawnPattern", null);
_respawnPattern = (pattern == null) || pattern.isEmpty() ? null : new SchedulingPattern(pattern);
_chaseRange = set.getInt("chaseRange", 0); _chaseRange = set.getInt("chaseRange", 0);
_spawnAnimation = set.getBoolean("spawnAnimation", false); _spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false); _saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc); spawn.setLocation(loc);
int respawn = 0; int respawn = 0;
int respawnRandom = 0; int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null) if (_respawnTime != null)
{ {
respawn = (int) _respawnTime.getSeconds(); respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{ {
respawnRandom = (int) _respawnTimeRandom.getSeconds(); respawnRandom = (int) _respawnTimeRandom.getSeconds();
} }
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0) if ((respawn > 0) || (respawnPattern != null))
{ {
spawn.setRespawnDelay(respawn, respawnRandom); spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn(); spawn.startRespawn();
} }
else else