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

Fixed NPC action shift when spawn group is null.

Browse Source
This commit is contained in:
MobiusDev 2017-08-31 03:22:42 +00:00
parent 86f4f257bd
commit ce279555a0
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java vendored
View File

@ -116,7 +116,7 @@ public class L2NpcActionShift implements IActionShiftHandler
final String fileName = template.getSpawnTemplate().getFile().getAbsolutePath().substring(Config.DATAPACK_ROOT.getAbsolutePath().length() + 1).replace('\\', '/'); final String fileName = template.getSpawnTemplate().getFile().getAbsolutePath().substring(Config.DATAPACK_ROOT.getAbsolutePath().length() + 1).replace('\\', '/');
html.replace("%spawnfile%", fileName); html.replace("%spawnfile%", fileName);
html.replace("%spawnname%", template.getSpawnTemplate().getName()); html.replace("%spawnname%", template.getSpawnTemplate().getName());
html.replace("%spawngroup%", template.getGroup().getName()); html.replace("%spawngroup%", String.valueOf(template.getGroup().getName())); // used String.valueOf because it can be null
if (template.getSpawnTemplate().getAI() != null) if (template.getSpawnTemplate().getAI() != null)
{ {
final Quest script = QuestManager.getInstance().getQuest(template.getSpawnTemplate().getAI()); final Quest script = QuestManager.getInstance().getQuest(template.getSpawnTemplate().getAI());
@ -137,11 +137,11 @@ public class L2NpcActionShift implements IActionShiftHandler
} }
else if (npc.getSpawn().hasRespawnRandom()) else if (npc.getSpawn().hasRespawnRandom())
{ {
html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + "-" + (npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec"); html.replace("%resp%", (npc.getSpawn().getRespawnMinDelay() / 1000) + "-" + (npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec");
} }
else else
{ {
html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + " sec"); html.replace("%resp%", (npc.getSpawn().getRespawnMinDelay() / 1000) + " sec");
} }
} }
else else

6
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java vendored
View File

@ -116,7 +116,7 @@ public class L2NpcActionShift implements IActionShiftHandler
final String fileName = template.getSpawnTemplate().getFile().getAbsolutePath().substring(Config.DATAPACK_ROOT.getAbsolutePath().length() + 1).replace('\\', '/'); final String fileName = template.getSpawnTemplate().getFile().getAbsolutePath().substring(Config.DATAPACK_ROOT.getAbsolutePath().length() + 1).replace('\\', '/');
html.replace("%spawnfile%", fileName); html.replace("%spawnfile%", fileName);
html.replace("%spawnname%", template.getSpawnTemplate().getName()); html.replace("%spawnname%", template.getSpawnTemplate().getName());
html.replace("%spawngroup%", template.getGroup().getName()); html.replace("%spawngroup%", String.valueOf(template.getGroup().getName())); // used String.valueOf because it can be null
if (template.getSpawnTemplate().getAI() != null) if (template.getSpawnTemplate().getAI() != null)
{ {
final Quest script = QuestManager.getInstance().getQuest(template.getSpawnTemplate().getAI()); final Quest script = QuestManager.getInstance().getQuest(template.getSpawnTemplate().getAI());
@ -137,11 +137,11 @@ public class L2NpcActionShift implements IActionShiftHandler
} }
else if (npc.getSpawn().hasRespawnRandom()) else if (npc.getSpawn().hasRespawnRandom())
{ {
html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + "-" + (npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec"); html.replace("%resp%", (npc.getSpawn().getRespawnMinDelay() / 1000) + "-" + (npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec");
} }
else else
{ {
html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + " sec"); html.replace("%resp%", (npc.getSpawn().getRespawnMinDelay() / 1000) + " sec");
} }
} }
else else

6
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java vendored
View File

@ -116,7 +116,7 @@ public class L2NpcActionShift implements IActionShiftHandler
final String fileName = template.getSpawnTemplate().getFile().getAbsolutePath().substring(Config.DATAPACK_ROOT.getAbsolutePath().length() + 1).replace('\\', '/'); final String fileName = template.getSpawnTemplate().getFile().getAbsolutePath().substring(Config.DATAPACK_ROOT.getAbsolutePath().length() + 1).replace('\\', '/');
html.replace("%spawnfile%", fileName); html.replace("%spawnfile%", fileName);
html.replace("%spawnname%", template.getSpawnTemplate().getName()); html.replace("%spawnname%", template.getSpawnTemplate().getName());
html.replace("%spawngroup%", template.getGroup().getName()); html.replace("%spawngroup%", String.valueOf(template.getGroup().getName())); // used String.valueOf because it can be null
if (template.getSpawnTemplate().getAI() != null) if (template.getSpawnTemplate().getAI() != null)
{ {
final Quest script = QuestManager.getInstance().getQuest(template.getSpawnTemplate().getAI()); final Quest script = QuestManager.getInstance().getQuest(template.getSpawnTemplate().getAI());
@ -137,11 +137,11 @@ public class L2NpcActionShift implements IActionShiftHandler
} }
else if (npc.getSpawn().hasRespawnRandom()) else if (npc.getSpawn().hasRespawnRandom())
{ {
html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + "-" + (npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec"); html.replace("%resp%", (npc.getSpawn().getRespawnMinDelay() / 1000) + "-" + (npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec");
} }
else else
{ {
html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + " sec"); html.replace("%resp%", (npc.getSpawn().getRespawnMinDelay() / 1000) + " sec");
} }
} }
else else

6
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java vendored
View File

@ -116,7 +116,7 @@ public class L2NpcActionShift implements IActionShiftHandler
final String fileName = template.getSpawnTemplate().getFile().getAbsolutePath().substring(Config.DATAPACK_ROOT.getAbsolutePath().length() + 1).replace('\\', '/'); final String fileName = template.getSpawnTemplate().getFile().getAbsolutePath().substring(Config.DATAPACK_ROOT.getAbsolutePath().length() + 1).replace('\\', '/');
html.replace("%spawnfile%", fileName); html.replace("%spawnfile%", fileName);
html.replace("%spawnname%", template.getSpawnTemplate().getName()); html.replace("%spawnname%", template.getSpawnTemplate().getName());
html.replace("%spawngroup%", template.getGroup().getName()); html.replace("%spawngroup%", String.valueOf(template.getGroup().getName())); // used String.valueOf because it can be null
if (template.getSpawnTemplate().getAI() != null) if (template.getSpawnTemplate().getAI() != null)
{ {
final Quest script = QuestManager.getInstance().getQuest(template.getSpawnTemplate().getAI()); final Quest script = QuestManager.getInstance().getQuest(template.getSpawnTemplate().getAI());
@ -137,11 +137,11 @@ public class L2NpcActionShift implements IActionShiftHandler
} }
else if (npc.getSpawn().hasRespawnRandom()) else if (npc.getSpawn().hasRespawnRandom())
{ {
html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + "-" + (npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec"); html.replace("%resp%", (npc.getSpawn().getRespawnMinDelay() / 1000) + "-" + (npc.getSpawn().getRespawnMaxDelay() / 1000) + " sec");
} }
else else
{ {
html.replace("%resp%", npc.getSpawn().getRespawnMinDelay() / 1000 + " sec"); html.replace("%resp%", (npc.getSpawn().getRespawnMinDelay() / 1000) + " sec");
} }
} }
else else