From 95186fa890fbf9bd8593625f24edd3219f2e213e Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 8 Jun 2018 16:42:06 +0000 Subject: [PATCH] Save instance time even if player is not online. --- .../game/data/scripts/instances/Kamaloka/Kamaloka.java | 7 +++++-- .../game/data/scripts/instances/Kamaloka/Kamaloka.java | 7 +++++-- .../game/data/scripts/instances/Kamaloka/Kamaloka.java | 7 +++++-- .../game/data/scripts/instances/Kamaloka/Kamaloka.java | 7 +++++-- .../instances/HallOfErosionAttack/HallOfErosionAttack.java | 7 +++++-- .../HallOfSufferingAttack/HallOfSufferingAttack.java | 7 +++++-- .../HallOfSufferingDefence/HallOfSufferingDefence.java | 7 +++++-- .../instances/HeartInfinityAttack/HeartInfinityAttack.java | 7 +++++-- .../dist/game/data/scripts/instances/AbstractInstance.java | 7 +++++-- .../game/data/scripts/instances/Kamaloka/Kamaloka.java | 7 +++++-- .../Q00694_BreakThroughTheHallOfSuffering.java | 7 +++++-- .../Q00695_DefendTheHallOfSuffering.java | 7 +++++-- 12 files changed, 60 insertions(+), 24 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 26fb1dd356..179203bf3b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -842,10 +842,13 @@ public final class Kamaloka extends AbstractInstance // set instance reenter time for all allowed players for (L2PcInstance plr : world.getAllowed()) { - if ((plr != null) && plr.isOnline()) + if (plr != null) { InstanceManager.getInstance().setReenterPenalty(plr.getObjectId(), world.getTemplateId(), reenter.getTimeInMillis()); - plr.sendPacket(sm); + if (plr.isOnline()) + { + plr.sendPacket(sm); + } } } world.finishInstance(); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 26fb1dd356..179203bf3b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -842,10 +842,13 @@ public final class Kamaloka extends AbstractInstance // set instance reenter time for all allowed players for (L2PcInstance plr : world.getAllowed()) { - if ((plr != null) && plr.isOnline()) + if (plr != null) { InstanceManager.getInstance().setReenterPenalty(plr.getObjectId(), world.getTemplateId(), reenter.getTimeInMillis()); - plr.sendPacket(sm); + if (plr.isOnline()) + { + plr.sendPacket(sm); + } } } world.finishInstance(); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 26fb1dd356..179203bf3b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -842,10 +842,13 @@ public final class Kamaloka extends AbstractInstance // set instance reenter time for all allowed players for (L2PcInstance plr : world.getAllowed()) { - if ((plr != null) && plr.isOnline()) + if (plr != null) { InstanceManager.getInstance().setReenterPenalty(plr.getObjectId(), world.getTemplateId(), reenter.getTimeInMillis()); - plr.sendPacket(sm); + if (plr.isOnline()) + { + plr.sendPacket(sm); + } } } world.finishInstance(); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 26fb1dd356..179203bf3b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -842,10 +842,13 @@ public final class Kamaloka extends AbstractInstance // set instance reenter time for all allowed players for (L2PcInstance plr : world.getAllowed()) { - if ((plr != null) && plr.isOnline()) + if (plr != null) { InstanceManager.getInstance().setReenterPenalty(plr.getObjectId(), world.getTemplateId(), reenter.getTimeInMillis()); - plr.sendPacket(sm); + if (plr.isOnline()) + { + plr.sendPacket(sm); + } } } world.finishInstance(); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java index eee5d2cdc1..d6b7f4e75a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java @@ -615,10 +615,13 @@ public class HallOfErosionAttack extends AbstractNpcAI for (L2PcInstance plr : world.getAllowed()) { - if ((plr != null) && plr.isOnline()) + if (plr != null) { InstanceManager.getInstance().setInstanceTime(plr.getObjectId(), INSTANCEID, reenter.getTimeInMillis()); - plr.sendPacket(sm); + if (plr.isOnline()) + { + plr.sendPacket(sm); + } } } final Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java index 71cd68e5d0..7f5527a535 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java @@ -449,10 +449,13 @@ public class HallOfSufferingAttack extends AbstractNpcAI // set instance reenter time for all allowed players for (L2PcInstance player : tmpworld.getAllowed()) { - if ((player != null) && player.isOnline()) + if (player != null) { InstanceManager.getInstance().setInstanceTime(player.getObjectId(), INSTANCEID, reenter.getTimeInMillis()); - player.sendPacket(sm); + if (player.isOnline()) + { + player.sendPacket(sm); + } } } startQuestTimer("spawnBossGuards", BOSS_MINION_SPAWN_TIME, npc, null); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java index b7e89c600a..b48498beb9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java @@ -449,10 +449,13 @@ public class HallOfSufferingDefence extends AbstractNpcAI // set instance reenter time for all allowed players for (L2PcInstance player : tmpworld.getAllowed()) { - if ((player != null) && player.isOnline()) + if (player != null) { InstanceManager.getInstance().setInstanceTime(player.getObjectId(), INSTANCEID, reenter.getTimeInMillis()); - player.sendPacket(sm); + if (player.isOnline()) + { + player.sendPacket(sm); + } } } startQuestTimer("spawnBossGuards", BOSS_MINION_SPAWN_TIME, npc, null); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java index 5d59c5d26f..8ad77a037a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java @@ -524,10 +524,13 @@ public class HeartInfinityAttack extends AbstractNpcAI for (L2PcInstance player : tmpworld.getAllowed()) { - if ((player != null) && player.isOnline()) + if (player != null) { InstanceManager.getInstance().setInstanceTime(player.getObjectId(), INSTANCEID, reenter.getTimeInMillis()); - player.sendPacket(sm); + if (player.isOnline()) + { + player.sendPacket(sm); + } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java index 6b82d343fc..554c846bd6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java @@ -188,10 +188,13 @@ public abstract class AbstractInstance extends AbstractNpcAI { for (L2PcInstance player : world.getAllowed()) { - if ((player != null) && player.isOnline()) + if (player != null) { InstanceManager.getInstance().setInstanceTime(player.getObjectId(), world.getTemplateId(), time); - player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE).addString(InstanceManager.getInstance().getInstanceIdName(world.getTemplateId()))); + if (player.isOnline()) + { + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE).addString(InstanceManager.getInstance().getInstanceIdName(world.getTemplateId()))); + } } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index bbc04cbe1f..d7dbf66c9a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -632,10 +632,13 @@ public final class Kamaloka extends AbstractInstance // set instance reenter time for all allowed players for (L2PcInstance plr : world.getAllowed()) { - if ((plr != null) && plr.isOnline()) + if (plr != null) { InstanceManager.getInstance().setInstanceTime(plr.getObjectId(), world.getTemplateId(), reenter.getTimeInMillis()); - plr.sendPacket(sm); + if (plr.isOnline()) + { + plr.sendPacket(sm); + } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java index 0bff39126f..22773618d8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java @@ -294,10 +294,13 @@ public final class Q00694_BreakThroughTheHallOfSuffering extends Quest for (L2PcInstance plr : world.getAllowed()) { - if ((plr != null) && plr.isOnline()) + if (plr != null) { InstanceManager.getInstance().setInstanceTime(plr.getObjectId(), TEMPLATE_ID, reenter.getTimeInMillis()); - plr.sendPacket(sm); + if (plr.isOnline()) + { + plr.sendPacket(sm); + } } } final Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java index 12b4c90db2..1eeaa8f0b3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java @@ -263,10 +263,13 @@ public final class Q00695_DefendTheHallOfSuffering extends Quest for (L2PcInstance plr : world.getAllowed()) { - if ((plr != null) && plr.isOnline()) + if (plr != null) { InstanceManager.getInstance().setInstanceTime(plr.getObjectId(), TEMPLATE_ID, reenter.getTimeInMillis()); - plr.sendPacket(sm); + if (plr.isOnline()) + { + plr.sendPacket(sm); + } } } final Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId());