From 2919ff4a8cc348096f3808ce23184c76daae1bba Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 5 Dec 2017 22:11:45 +0000 Subject: [PATCH] Improvement for previous commit. --- .../dist/game/data/scripts/instances/AbstractInstance.java | 7 ++----- .../dist/game/data/scripts/instances/AbstractInstance.java | 7 ++----- .../dist/game/data/scripts/instances/AbstractInstance.java | 7 ++----- .../dist/game/data/scripts/instances/AbstractInstance.java | 7 ++----- .../dist/game/data/scripts/instances/AbstractInstance.java | 7 ++----- 5 files changed, 10 insertions(+), 25 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java index 22d5b8a736..7dced5f20e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/AbstractInstance.java @@ -158,11 +158,8 @@ public abstract class AbstractInstance extends AbstractNpcAI enterGroup.forEach(p -> p.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON)); return; } - } - - // Check if any player from the group has already finished the instance - for (L2PcInstance member : enterGroup) - { + + // Check if any player from the group has already finished the instance if (InstanceManager.getInstance().getInstanceTime(member, templateId) > 0) { enterGroup.forEach(p -> p.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addString(member.getName()))); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java index 22d5b8a736..7dced5f20e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/AbstractInstance.java @@ -158,11 +158,8 @@ public abstract class AbstractInstance extends AbstractNpcAI enterGroup.forEach(p -> p.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON)); return; } - } - - // Check if any player from the group has already finished the instance - for (L2PcInstance member : enterGroup) - { + + // Check if any player from the group has already finished the instance if (InstanceManager.getInstance().getInstanceTime(member, templateId) > 0) { enterGroup.forEach(p -> p.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addString(member.getName()))); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java index 22d5b8a736..7dced5f20e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/AbstractInstance.java @@ -158,11 +158,8 @@ public abstract class AbstractInstance extends AbstractNpcAI enterGroup.forEach(p -> p.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON)); return; } - } - - // Check if any player from the group has already finished the instance - for (L2PcInstance member : enterGroup) - { + + // Check if any player from the group has already finished the instance if (InstanceManager.getInstance().getInstanceTime(member, templateId) > 0) { enterGroup.forEach(p -> p.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addString(member.getName()))); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java index 22d5b8a736..7dced5f20e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/AbstractInstance.java @@ -158,11 +158,8 @@ public abstract class AbstractInstance extends AbstractNpcAI enterGroup.forEach(p -> p.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON)); return; } - } - - // Check if any player from the group has already finished the instance - for (L2PcInstance member : enterGroup) - { + + // Check if any player from the group has already finished the instance if (InstanceManager.getInstance().getInstanceTime(member, templateId) > 0) { enterGroup.forEach(p -> p.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addString(member.getName()))); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java index 22d5b8a736..7dced5f20e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/instances/AbstractInstance.java @@ -158,11 +158,8 @@ public abstract class AbstractInstance extends AbstractNpcAI enterGroup.forEach(p -> p.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON)); return; } - } - - // Check if any player from the group has already finished the instance - for (L2PcInstance member : enterGroup) - { + + // Check if any player from the group has already finished the instance if (InstanceManager.getInstance().getInstanceTime(member, templateId) > 0) { enterGroup.forEach(p -> p.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addString(member.getName())));