Extra check for instance re-enter time.

This commit is contained in:
MobiusDev 2017-12-05 22:10:02 +00:00
parent b33352abb5
commit 7414483959
5 changed files with 55 additions and 0 deletions

View File

@ -30,6 +30,7 @@ import com.l2jmobius.gameserver.model.instancezone.InstanceTemplate;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import ai.AbstractNpcAI;
@ -159,6 +160,16 @@ public abstract class AbstractInstance extends AbstractNpcAI
}
}
// Check if any player from the group has already finished the instance
for (L2PcInstance member : enterGroup)
{
if (InstanceManager.getInstance().getInstanceTime(member, templateId) > 0)
{
enterGroup.forEach(p -> p.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addString(member.getName())));
return;
}
}
// Create new instance for enter player group
instance = manager.createInstance(template, player);

View File

@ -30,6 +30,7 @@ import com.l2jmobius.gameserver.model.instancezone.InstanceTemplate;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import ai.AbstractNpcAI;
@ -159,6 +160,16 @@ public abstract class AbstractInstance extends AbstractNpcAI
}
}
// Check if any player from the group has already finished the instance
for (L2PcInstance member : enterGroup)
{
if (InstanceManager.getInstance().getInstanceTime(member, templateId) > 0)
{
enterGroup.forEach(p -> p.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addString(member.getName())));
return;
}
}
// Create new instance for enter player group
instance = manager.createInstance(template, player);

View File

@ -30,6 +30,7 @@ import com.l2jmobius.gameserver.model.instancezone.InstanceTemplate;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import ai.AbstractNpcAI;
@ -159,6 +160,16 @@ public abstract class AbstractInstance extends AbstractNpcAI
}
}
// Check if any player from the group has already finished the instance
for (L2PcInstance member : enterGroup)
{
if (InstanceManager.getInstance().getInstanceTime(member, templateId) > 0)
{
enterGroup.forEach(p -> p.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addString(member.getName())));
return;
}
}
// Create new instance for enter player group
instance = manager.createInstance(template, player);

View File

@ -30,6 +30,7 @@ import com.l2jmobius.gameserver.model.instancezone.InstanceTemplate;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import ai.AbstractNpcAI;
@ -159,6 +160,16 @@ public abstract class AbstractInstance extends AbstractNpcAI
}
}
// Check if any player from the group has already finished the instance
for (L2PcInstance member : enterGroup)
{
if (InstanceManager.getInstance().getInstanceTime(member, templateId) > 0)
{
enterGroup.forEach(p -> p.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addString(member.getName())));
return;
}
}
// Create new instance for enter player group
instance = manager.createInstance(template, player);

View File

@ -30,6 +30,7 @@ import com.l2jmobius.gameserver.model.instancezone.InstanceTemplate;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import ai.AbstractNpcAI;
@ -159,6 +160,16 @@ public abstract class AbstractInstance extends AbstractNpcAI
}
}
// Check if any player from the group has already finished the instance
for (L2PcInstance member : enterGroup)
{
if (InstanceManager.getInstance().getInstanceTime(member, templateId) > 0)
{
enterGroup.forEach(p -> p.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET).addString(member.getName())));
return;
}
}
// Create new instance for enter player group
instance = manager.createInstance(template, player);