lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Zaken enter instance method.

Browse Source
This commit is contained in:
MobiusDev 2018-04-19 21:54:49 +00:00
parent c4ec3855a5
commit 9be2cb4243
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java vendored
View File

@ -184,11 +184,6 @@ public abstract class AbstractInstance extends AbstractNpcAI
protected abstract void onEnterInstance(L2PcInstance player, InstanceWorld world, boolean firstEntrance); protected abstract void onEnterInstance(L2PcInstance player, InstanceWorld world, boolean firstEntrance);
protected boolean checkConditions(L2PcInstance player, int templateId)
{
return checkConditions(player);
}
protected boolean checkConditions(L2PcInstance player) protected boolean checkConditions(L2PcInstance player)
{ {
return true; return true;

12
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java vendored
View File

@ -206,8 +206,7 @@ public final class CavernOfThePirateCaptain extends AbstractInstance
teleportPlayer(player, ENTER_LOC[getRandom(ENTER_LOC.length)], world.getInstanceId(), false); teleportPlayer(player, ENTER_LOC[getRandom(ENTER_LOC.length)], world.getInstanceId(), false);
} }
@Override private boolean checkConditions(L2PcInstance player, int templateId)
protected boolean checkConditions(L2PcInstance player, int templateId)
{ {
if (player.canOverrideCond(PcCondOverride.INSTANCE_CONDITIONS)) if (player.canOverrideCond(PcCondOverride.INSTANCE_CONDITIONS))
{ {
@ -290,17 +289,26 @@ public final class CavernOfThePirateCaptain extends AbstractInstance
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{ {
if (event.equals("enter60")) if (event.equals("enter60"))
{
if (checkConditions(player, TEMPLATE_ID_60))
{ {
enterInstance(player, new CavernOfThePirateCaptainWorld(), "CavernOfThePirateCaptainWorldDay60.xml", TEMPLATE_ID_60); enterInstance(player, new CavernOfThePirateCaptainWorld(), "CavernOfThePirateCaptainWorldDay60.xml", TEMPLATE_ID_60);
} }
}
else if (event.equals("enter60night")) else if (event.equals("enter60night"))
{
if (checkConditions(player, TEMPLATE_ID_60_NIGHT))
{ {
enterInstance(player, new CavernOfThePirateCaptainWorld(), "CavernOfThePirateCaptainWorldNight60.xml", TEMPLATE_ID_60_NIGHT); enterInstance(player, new CavernOfThePirateCaptainWorld(), "CavernOfThePirateCaptainWorldNight60.xml", TEMPLATE_ID_60_NIGHT);
} }
}
else if (event.equals("enter83")) else if (event.equals("enter83"))
{
if (checkConditions(player, TEMPLATE_ID_83))
{ {
enterInstance(player, new CavernOfThePirateCaptainWorld(), "CavernOfThePirateCaptainWorldDay83.xml", TEMPLATE_ID_83); enterInstance(player, new CavernOfThePirateCaptainWorld(), "CavernOfThePirateCaptainWorldDay83.xml", TEMPLATE_ID_83);
} }
}
else else
{ {
final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId());