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_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -219,13 +219,16 @@ public class DBSpawnManager
npc.setDBStatus(RaidBossStatus.DEAD);
final SchedulingPattern respawnPattern = npc.getSpawn().getRespawnPattern();
int respawnMinDelay, respawnMaxDelay, respawnDelay;
long respawnTime;
final int respawnMinDelay;
final int respawnMaxDelay;
final int respawnDelay;
final long respawnTime;
if (respawnPattern != null)
{
respawnTime = respawnPattern.next(System.currentTimeMillis());
respawnMinDelay = respawnMaxDelay = respawnDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMinDelay = (int) (respawnTime - System.currentTimeMillis());
respawnMaxDelay = respawnMinDelay;
respawnDelay = respawnMinDelay;
}
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);
_respawnTime = set.getDuration("respawnTime", 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);
_spawnAnimation = set.getBoolean("spawnAnimation", false);
_saveInDB = set.getBoolean("dbSave", false);
@@ -381,6 +382,7 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
spawn.setLocation(loc);
int respawn = 0;
int respawnRandom = 0;
SchedulingPattern respawnPattern = null;
if (_respawnTime != null)
{
respawn = (int) _respawnTime.getSeconds();
@@ -389,10 +391,15 @@ public class NpcSpawnTemplate implements Cloneable, IParameterized<StatSet>
{
respawnRandom = (int) _respawnTimeRandom.getSeconds();
}
if (_respawnPattern != null)
{
respawnPattern = _respawnPattern;
}
if (respawn > 0)
if ((respawn > 0) || (respawnPattern != null))
{
spawn.setRespawnDelay(respawn, respawnRandom);
spawn.setRespawnPattern(respawnPattern);
spawn.startRespawn();
}
else