diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java index 381144af78..542990f2b8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/AbstractInstance.java @@ -184,11 +184,6 @@ public abstract class AbstractInstance extends AbstractNpcAI 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) { return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java index 0498591522..84ac7914ea 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java @@ -206,8 +206,7 @@ public final class CavernOfThePirateCaptain extends AbstractInstance teleportPlayer(player, ENTER_LOC[getRandom(ENTER_LOC.length)], world.getInstanceId(), false); } - @Override - protected boolean checkConditions(L2PcInstance player, int templateId) + private boolean checkConditions(L2PcInstance player, int templateId) { if (player.canOverrideCond(PcCondOverride.INSTANCE_CONDITIONS)) { @@ -291,15 +290,24 @@ public final class CavernOfThePirateCaptain extends AbstractInstance { if (event.equals("enter60")) { - enterInstance(player, new CavernOfThePirateCaptainWorld(), "CavernOfThePirateCaptainWorldDay60.xml", TEMPLATE_ID_60); + if (checkConditions(player, TEMPLATE_ID_60)) + { + enterInstance(player, new CavernOfThePirateCaptainWorld(), "CavernOfThePirateCaptainWorldDay60.xml", TEMPLATE_ID_60); + } } else if (event.equals("enter60night")) { - enterInstance(player, new CavernOfThePirateCaptainWorld(), "CavernOfThePirateCaptainWorldNight60.xml", TEMPLATE_ID_60_NIGHT); + if (checkConditions(player, TEMPLATE_ID_60_NIGHT)) + { + enterInstance(player, new CavernOfThePirateCaptainWorld(), "CavernOfThePirateCaptainWorldNight60.xml", TEMPLATE_ID_60_NIGHT); + } } else if (event.equals("enter83")) { - enterInstance(player, new CavernOfThePirateCaptainWorld(), "CavernOfThePirateCaptainWorldDay83.xml", TEMPLATE_ID_83); + if (checkConditions(player, TEMPLATE_ID_83)) + { + enterInstance(player, new CavernOfThePirateCaptainWorld(), "CavernOfThePirateCaptainWorldDay83.xml", TEMPLATE_ID_83); + } } else {