From 0b03da19bb6ee26376abdf0667f55f1be852a8e4 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 30 Mar 2019 16:10:53 +0000 Subject: [PATCH] Force setReenterTime for Story of Freya. --- .../MysticTavern/StoryOfFreya/StoryOfFreya.java | 13 +++++++++---- .../MysticTavern/StoryOfFreya/StoryOfFreya.java | 13 +++++++++---- .../MysticTavern/StoryOfFreya/StoryOfFreya.java | 13 +++++++++---- .../MysticTavern/StoryOfFreya/StoryOfFreya.java | 13 +++++++++---- .../MysticTavern/StoryOfFreya/StoryOfFreya.java | 13 +++++++++---- .../MysticTavern/StoryOfFreya/StoryOfFreya.java | 13 +++++++++---- 6 files changed, 54 insertions(+), 24 deletions(-) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java index 12f0e6ebbc..155003339b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java @@ -22,9 +22,9 @@ import com.l2jmobius.Config; import com.l2jmobius.gameserver.enums.Movie; import com.l2jmobius.gameserver.instancemanager.QuestManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager; +import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.Party; import com.l2jmobius.gameserver.model.World; -import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.Npc; import com.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -126,16 +126,21 @@ public class StoryOfFreya extends AbstractInstance { player.standUp(); enterInstance(player, null, TEMPLATE_ID); - if (player.getParty() != null) + final Party party = player.getParty(); + if (party != null) { - for (PlayerInstance member : player.getParty().getMembers()) + final Instance instance = player.getInstanceWorld(); + for (PlayerInstance member : party.getMembers()) { if (member != player) { member.standUp(); - member.teleToLocation(player, player.getInstanceWorld()); + member.teleToLocation(player, instance); + instance.addPlayer(member); + instance.addAllowed(member); } } + instance.setReenterTime(); } break; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java index 12f0e6ebbc..155003339b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java @@ -22,9 +22,9 @@ import com.l2jmobius.Config; import com.l2jmobius.gameserver.enums.Movie; import com.l2jmobius.gameserver.instancemanager.QuestManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager; +import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.Party; import com.l2jmobius.gameserver.model.World; -import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.Npc; import com.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -126,16 +126,21 @@ public class StoryOfFreya extends AbstractInstance { player.standUp(); enterInstance(player, null, TEMPLATE_ID); - if (player.getParty() != null) + final Party party = player.getParty(); + if (party != null) { - for (PlayerInstance member : player.getParty().getMembers()) + final Instance instance = player.getInstanceWorld(); + for (PlayerInstance member : party.getMembers()) { if (member != player) { member.standUp(); - member.teleToLocation(player, player.getInstanceWorld()); + member.teleToLocation(player, instance); + instance.addPlayer(member); + instance.addAllowed(member); } } + instance.setReenterTime(); } break; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java index 12f0e6ebbc..155003339b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java @@ -22,9 +22,9 @@ import com.l2jmobius.Config; import com.l2jmobius.gameserver.enums.Movie; import com.l2jmobius.gameserver.instancemanager.QuestManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager; +import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.Party; import com.l2jmobius.gameserver.model.World; -import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.Npc; import com.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -126,16 +126,21 @@ public class StoryOfFreya extends AbstractInstance { player.standUp(); enterInstance(player, null, TEMPLATE_ID); - if (player.getParty() != null) + final Party party = player.getParty(); + if (party != null) { - for (PlayerInstance member : player.getParty().getMembers()) + final Instance instance = player.getInstanceWorld(); + for (PlayerInstance member : party.getMembers()) { if (member != player) { member.standUp(); - member.teleToLocation(player, player.getInstanceWorld()); + member.teleToLocation(player, instance); + instance.addPlayer(member); + instance.addAllowed(member); } } + instance.setReenterTime(); } break; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java index 12f0e6ebbc..155003339b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java @@ -22,9 +22,9 @@ import com.l2jmobius.Config; import com.l2jmobius.gameserver.enums.Movie; import com.l2jmobius.gameserver.instancemanager.QuestManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager; +import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.Party; import com.l2jmobius.gameserver.model.World; -import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.Npc; import com.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -126,16 +126,21 @@ public class StoryOfFreya extends AbstractInstance { player.standUp(); enterInstance(player, null, TEMPLATE_ID); - if (player.getParty() != null) + final Party party = player.getParty(); + if (party != null) { - for (PlayerInstance member : player.getParty().getMembers()) + final Instance instance = player.getInstanceWorld(); + for (PlayerInstance member : party.getMembers()) { if (member != player) { member.standUp(); - member.teleToLocation(player, player.getInstanceWorld()); + member.teleToLocation(player, instance); + instance.addPlayer(member); + instance.addAllowed(member); } } + instance.setReenterTime(); } break; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java index 12f0e6ebbc..155003339b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java @@ -22,9 +22,9 @@ import com.l2jmobius.Config; import com.l2jmobius.gameserver.enums.Movie; import com.l2jmobius.gameserver.instancemanager.QuestManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager; +import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.Party; import com.l2jmobius.gameserver.model.World; -import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.Npc; import com.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -126,16 +126,21 @@ public class StoryOfFreya extends AbstractInstance { player.standUp(); enterInstance(player, null, TEMPLATE_ID); - if (player.getParty() != null) + final Party party = player.getParty(); + if (party != null) { - for (PlayerInstance member : player.getParty().getMembers()) + final Instance instance = player.getInstanceWorld(); + for (PlayerInstance member : party.getMembers()) { if (member != player) { member.standUp(); - member.teleToLocation(player, player.getInstanceWorld()); + member.teleToLocation(player, instance); + instance.addPlayer(member); + instance.addAllowed(member); } } + instance.setReenterTime(); } break; } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java index 12f0e6ebbc..155003339b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/MysticTavern/StoryOfFreya/StoryOfFreya.java @@ -22,9 +22,9 @@ import com.l2jmobius.Config; import com.l2jmobius.gameserver.enums.Movie; import com.l2jmobius.gameserver.instancemanager.QuestManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager; +import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.Party; import com.l2jmobius.gameserver.model.World; -import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.Npc; import com.l2jmobius.gameserver.model.actor.instance.FriendlyNpcInstance; import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -126,16 +126,21 @@ public class StoryOfFreya extends AbstractInstance { player.standUp(); enterInstance(player, null, TEMPLATE_ID); - if (player.getParty() != null) + final Party party = player.getParty(); + if (party != null) { - for (PlayerInstance member : player.getParty().getMembers()) + final Instance instance = player.getInstanceWorld(); + for (PlayerInstance member : party.getMembers()) { if (member != player) { member.standUp(); - member.teleToLocation(player, player.getInstanceWorld()); + member.teleToLocation(player, instance); + instance.addPlayer(member); + instance.addAllowed(member); } } + instance.setReenterTime(); } break; }