diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Fortuna/Fortuna.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Fortuna/Fortuna.java index f98673c6c4..c3676334f5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Fortuna/Fortuna.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Fortuna/Fortuna.java @@ -77,9 +77,10 @@ public class Fortuna extends AbstractInstance { for (L2PcInstance member : player.getParty().getMembers()) { - if ((member.getInstanceWorld() != null) && (member.getInstanceWorld().getTemplateId() == TEMPLATE_ID)) + final Instance world = member.getInstanceWorld(); + if ((world != null) && (world.getTemplateId() == TEMPLATE_ID) && (world.getPlayersCount() < 7)) { - player.teleToLocation(RE_ENTRY_LOCATION.getX(), RE_ENTRY_LOCATION.getY(), RE_ENTRY_LOCATION.getZ(), member.getInstanceWorld()); + player.teleToLocation(RE_ENTRY_LOCATION, world); break; } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Fortuna/Fortuna.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Fortuna/Fortuna.java index f98673c6c4..c3676334f5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Fortuna/Fortuna.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Fortuna/Fortuna.java @@ -77,9 +77,10 @@ public class Fortuna extends AbstractInstance { for (L2PcInstance member : player.getParty().getMembers()) { - if ((member.getInstanceWorld() != null) && (member.getInstanceWorld().getTemplateId() == TEMPLATE_ID)) + final Instance world = member.getInstanceWorld(); + if ((world != null) && (world.getTemplateId() == TEMPLATE_ID) && (world.getPlayersCount() < 7)) { - player.teleToLocation(RE_ENTRY_LOCATION.getX(), RE_ENTRY_LOCATION.getY(), RE_ENTRY_LOCATION.getZ(), member.getInstanceWorld()); + player.teleToLocation(RE_ENTRY_LOCATION, world); break; } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Fortuna/Fortuna.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Fortuna/Fortuna.java index f98673c6c4..c3676334f5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Fortuna/Fortuna.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Fortuna/Fortuna.java @@ -77,9 +77,10 @@ public class Fortuna extends AbstractInstance { for (L2PcInstance member : player.getParty().getMembers()) { - if ((member.getInstanceWorld() != null) && (member.getInstanceWorld().getTemplateId() == TEMPLATE_ID)) + final Instance world = member.getInstanceWorld(); + if ((world != null) && (world.getTemplateId() == TEMPLATE_ID) && (world.getPlayersCount() < 7)) { - player.teleToLocation(RE_ENTRY_LOCATION.getX(), RE_ENTRY_LOCATION.getY(), RE_ENTRY_LOCATION.getZ(), member.getInstanceWorld()); + player.teleToLocation(RE_ENTRY_LOCATION, world); break; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Fortuna/Fortuna.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Fortuna/Fortuna.java index f98673c6c4..c3676334f5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Fortuna/Fortuna.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Fortuna/Fortuna.java @@ -77,9 +77,10 @@ public class Fortuna extends AbstractInstance { for (L2PcInstance member : player.getParty().getMembers()) { - if ((member.getInstanceWorld() != null) && (member.getInstanceWorld().getTemplateId() == TEMPLATE_ID)) + final Instance world = member.getInstanceWorld(); + if ((world != null) && (world.getTemplateId() == TEMPLATE_ID) && (world.getPlayersCount() < 7)) { - player.teleToLocation(RE_ENTRY_LOCATION.getX(), RE_ENTRY_LOCATION.getY(), RE_ENTRY_LOCATION.getZ(), member.getInstanceWorld()); + player.teleToLocation(RE_ENTRY_LOCATION, world); break; } }