From dca612dbb5c31bcb549e2bdb7bb627f4c6b1829b Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 30 Apr 2018 02:24:41 +0000 Subject: [PATCH] Removed instance getter from InstanceWorld. --- .../ai/areas/FrozenLabyrinth/Sirra/Sirra.java | 4 +- .../admincommandhandlers/AdminInstance.java | 2 +- .../usercommandhandlers/InstanceZone.java | 4 +- .../scripts/instances/AbstractInstance.java | 6 +-- .../CavernOfThePirateCaptain.java | 4 +- .../instances/ChambersOfDelusion/Chamber.java | 4 +- .../CrystalCaverns/CrystalCaverns.java | 2 +- .../IceQueensCastleBattle.java | 2 +- .../scripts/instances/Kamaloka/Kamaloka.java | 17 ++++---- .../NornilsGarden/NornilsGarden.java | 41 ++++++++----------- .../PailakaDevilsLegacy.java | 2 +- .../PailakaSongOfIceAndFire.java | 2 +- .../Q00144_PailakaInjuredDragon.java | 4 +- .../Q00511_AwlUnderFoot.java | 5 ++- ...Q00694_BreakThroughTheHallOfSuffering.java | 2 +- .../Q00695_DefendTheHallOfSuffering.java | 2 +- .../Q00726_LightWithinTheDarkness.java | 5 ++- .../Q00727_HopeWithinTheDarkness.java | 5 ++- .../conditions/ConditionPlayerInstanceId.java | 2 +- .../model/instancezone/InstanceWorld.java | 18 ++++---- .../gameserver/model/zone/L2ZoneType.java | 2 +- 21 files changed, 67 insertions(+), 68 deletions(-) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Sirra/Sirra.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Sirra/Sirra.java index 5bb4d06027..a5539a2a15 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Sirra/Sirra.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/FrozenLabyrinth/Sirra/Sirra.java @@ -45,11 +45,11 @@ public final class Sirra extends AbstractNpcAI { final InstanceWorld world = InstanceManager.getInstance().getWorld(npc); - if ((world != null) && (world.getInstance().getTemplateId() == FREYA_INSTID)) + if ((world != null) && (world.getTemplateId() == FREYA_INSTID)) { return (world.isStatus(0)) ? "32762-easy.html" : "32762-easyfight.html"; } - else if ((world != null) && (world.getInstance().getTemplateId() == FREYA_HARD_INSTID)) + else if ((world != null) && (world.getTemplateId() == FREYA_HARD_INSTID)) { return (world.isStatus(0)) ? "32762-hard.html" : "32762-hardfight.html"; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java index 43529780c5..7118f36c61 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstance.java @@ -87,7 +87,7 @@ public class AdminInstance implements IAdminCommandHandler if (world != null) { counter++; - activeChar.sendMessage("Id: " + instance.getId() + " Name: " + InstanceManager.getInstance().getInstanceIdName(world.getInstance().getTemplateId())); + activeChar.sendMessage("Id: " + instance.getId() + " Name: " + InstanceManager.getInstance().getInstanceIdName(world.getTemplateId())); } } if (counter == 0) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java index 70dbf2c2a2..616ccecabb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java @@ -51,10 +51,10 @@ public class InstanceZone implements IUserCommandHandler } final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(activeChar); - if ((world != null) && (world.getInstance().getTemplateId() >= 0)) + if ((world != null) && (world.getTemplateId() >= 0)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_CURRENTLY_IN_USE_S1); - sm.addInstanceName(world.getInstance().getTemplateId()); + sm.addInstanceName(world.getTemplateId()); activeChar.sendPacket(sm); } 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 0e8e73f425..48a2f12ed2 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 @@ -52,7 +52,7 @@ public abstract class AbstractInstance extends AbstractNpcAI final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); if (world != null) { - if (world.getInstance().getTemplateId() == templateId) + if (world.getTemplateId() == templateId) { onEnterInstance(player, world, false); @@ -191,11 +191,11 @@ public abstract class AbstractInstance extends AbstractNpcAI { for (int objectId : world.getAllowed()) { - InstanceManager.getInstance().setInstanceTime(objectId, world.getInstance().getTemplateId(), time); + InstanceManager.getInstance().setInstanceTime(objectId, world.getTemplateId(), time); final L2PcInstance player = L2World.getInstance().getPlayer(objectId); if ((player != null) && player.isOnline()) { - player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE).addString(InstanceManager.getInstance().getInstanceIdName(world.getInstance().getTemplateId()))); + player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE).addString(InstanceManager.getInstance().getInstanceIdName(world.getTemplateId()))); } } } 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 8f91209286..aeb90eca4d 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 @@ -157,8 +157,8 @@ public final class CavernOfThePirateCaptain extends AbstractInstance { if (firstEntrance) { - world.setParameter("is83", world.getInstance().getTemplateId() == TEMPLATE_ID_83); - world.setParameter("isNight", world.getInstance().getTemplateId() == TEMPLATE_ID_60_NIGHT); + world.setParameter("is83", world.getTemplateId() == TEMPLATE_ID_83); + world.setParameter("isNight", world.getTemplateId() == TEMPLATE_ID_60_NIGHT); world.setParameter("storeTime", System.currentTimeMillis()); final List playersInside = new ArrayList<>(); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java index a17481ed81..2056d1a696 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java @@ -178,14 +178,14 @@ public abstract class Chamber extends AbstractInstance reenter.add(Calendar.DAY_OF_WEEK, 1); } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE); - sm.addString(InstanceManager.getInstance().getInstanceIdName(world.getInstance().getTemplateId())); + sm.addString(InstanceManager.getInstance().getInstanceIdName(world.getTemplateId())); // set instance reenter time for all allowed players for (int objectId : world.getAllowed()) { final L2PcInstance player = L2World.getInstance().getPlayer(objectId); if ((player != null) && player.isOnline()) { - InstanceManager.getInstance().setInstanceTime(objectId, world.getInstance().getTemplateId(), reenter.getTimeInMillis()); + InstanceManager.getInstance().setInstanceTime(objectId, world.getTemplateId(), reenter.getTimeInMillis()); player.sendPacket(sm); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java index 84bba23e94..6d91047fd8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java @@ -1768,7 +1768,7 @@ public final class CrystalCaverns extends AbstractInstance final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); if (world != null) { - if (world.getInstance().getTemplateId() == TEMPLATE_ID) + if (world.getTemplateId() == TEMPLATE_ID) { onEnterInstance(player, world, false); return ""; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java index dd30b4bb20..820fcfeda0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -1195,7 +1195,7 @@ public final class IceQueensCastleBattle extends AbstractInstance { if (firstEntrance) { - world.setParameter("isHardCore", world.getInstance().getTemplateId() == TEMPLATE_ID_HARD); + world.setParameter("isHardCore", world.getTemplateId() == TEMPLATE_ID_HARD); final List playersInside = new ArrayList<>(); if (!player.isInParty()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 1fdf96ec75..385a7b699f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -551,7 +551,7 @@ public final class Kamaloka extends AbstractInstance if (world != null) { // but not in kamaloka - if (!(world instanceof KamaWorld) || (world.getInstance().getTemplateId() != templateId)) + if (!(world instanceof KamaWorld) || (world.getTemplateId() != templateId)) { player.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON); return; @@ -581,15 +581,16 @@ public final class Kamaloka extends AbstractInstance // Creating new instanceWorld, using our instanceId and templateId world = new KamaWorld(); - world.setInstance(InstanceManager.getInstance().createDynamicInstance(templateId)); + final Instance instance = InstanceManager.getInstance().createDynamicInstance(templateId); + world.setInstance(instance); // set return location - world.getInstance().setExitLoc(new Location(player)); + instance.setExitLoc(new Location(player)); // disable summon friend into instance - world.getInstance().setAllowSummon(false); + instance.setAllowSummon(false); // set duration and empty destroy time - world.getInstance().setDuration(DURATION[index] * 60000); - world.getInstance().setEmptyDestroyTime(EMPTY_DESTROY_TIME * 60000); + instance.setDuration(DURATION[index] * 60000); + instance.setEmptyDestroyTime(EMPTY_DESTROY_TIME * 60000); // set index for easy access to the arrays ((KamaWorld) world).index = index; @@ -627,7 +628,7 @@ public final class Kamaloka extends AbstractInstance reenter.set(Calendar.HOUR_OF_DAY, RESET_HOUR); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_S_ENTRY_HAS_BEEN_RESTRICTED_YOU_CAN_CHECK_THE_NEXT_POSSIBLE_ENTRY_TIME_BY_USING_THE_COMMAND_INSTANCEZONE); - sm.addInstanceName(world.getInstance().getTemplateId()); + sm.addInstanceName(world.getTemplateId()); // set instance reenter time for all allowed players for (int objectId : world.getAllowed()) @@ -635,7 +636,7 @@ public final class Kamaloka extends AbstractInstance final L2PcInstance obj = L2World.getInstance().getPlayer(objectId); if ((obj != null) && obj.isOnline()) { - InstanceManager.getInstance().setInstanceTime(objectId, world.getInstance().getTemplateId(), reenter.getTimeInMillis()); + InstanceManager.getInstance().setInstanceTime(objectId, world.getTemplateId(), reenter.getTimeInMillis()); obj.sendPacket(sm); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java index b9f49e7de9..fa57b7d0f7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java @@ -240,10 +240,10 @@ public final class NornilsGarden extends AbstractInstance private final synchronized String enterInstance(L2Npc npc, L2PcInstance player) { - InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); + final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); if (world != null) { - if (!(world instanceof NornilsWorld) || (world.getInstance().getTemplateId() != TEMPLATE_ID)) + if (!(world instanceof NornilsWorld) || (world.getTemplateId() != TEMPLATE_ID)) { player.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON); return null; @@ -271,17 +271,24 @@ public final class NornilsGarden extends AbstractInstance return result; } - world = new NornilsWorld(); - world.setInstance(InstanceManager.getInstance().createDynamicInstance(TEMPLATE_ID)); + final NornilsWorld newWorld = new NornilsWorld(); + final Instance instance = InstanceManager.getInstance().createDynamicInstance(TEMPLATE_ID); + newWorld.setInstance(instance); InstanceManager.getInstance().addWorld(world); - world.getInstance().setExitLoc(new Location(player)); - world.getInstance().setAllowSummon(false); - world.getInstance().setDuration(DURATION_TIME * 60000); - world.getInstance().setEmptyDestroyTime(EMPTY_DESTROY_TIME * 60000); - final int instanceId = world.getInstanceId(); + instance.setExitLoc(new Location(player)); + instance.setAllowSummon(false); + instance.setDuration(DURATION_TIME * 60000); + instance.setEmptyDestroyTime(EMPTY_DESTROY_TIME * 60000); + final int instanceId = newWorld.getInstanceId(); LOGGER.info("Nornils Garden: started, Instance: " + instanceId + " created by player: " + player.getName()); - prepareInstance((NornilsWorld) world); + newWorld.first_npc = addSpawn(18362, -109702, 74696, -12528, 49568, false, 0, false, newWorld.getInstanceId()); + final L2DoorInstance door = instance.getDoor(16200010); + if (door != null) + { + door.setTargetable(false); + door.setMeshIndex(2); + } // and finally teleport party into instance final L2Party party = player.getParty(); @@ -289,25 +296,13 @@ public final class NornilsGarden extends AbstractInstance { for (L2PcInstance partyMember : party.getMembers()) { - world.addAllowed(partyMember.getObjectId()); + newWorld.addAllowed(partyMember.getObjectId()); teleportPlayer(partyMember, SPAWN_PPL, instanceId); } } return null; } - private void prepareInstance(NornilsWorld world) - { - world.first_npc = addSpawn(18362, -109702, 74696, -12528, 49568, false, 0, false, world.getInstanceId()); - - final L2DoorInstance door = world.getInstance().getDoor(16200010); - if (door != null) - { - door.setTargetable(false); - door.setMeshIndex(2); - } - } - private void spawn1(L2Npc npc) { final InstanceWorld inst = InstanceManager.getInstance().getWorld(npc); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java index 68e7eff671..d51744af8f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java @@ -273,7 +273,7 @@ public final class PailakaDevilsLegacy extends AbstractInstance if ((character.isPlayer()) && !character.isDead() && !character.isTeleporting() && ((L2PcInstance) character).isOnline()) { final InstanceWorld world = InstanceManager.getInstance().getWorld(character); - if ((world != null) && (world.getInstance().getTemplateId() == TEMPLATE_ID)) + if ((world != null) && (world.getTemplateId() == TEMPLATE_ID)) { startQuestTimer("TELEPORT", 1000, world.getParameters().getObject("lematanNpc", L2Npc.class), (L2PcInstance) character); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java index f99f5addde..2d09ee36e2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java @@ -170,7 +170,7 @@ public final class PailakaSongOfIceAndFire extends AbstractInstance if ((character.isPlayer()) && !character.isDead() && !character.isTeleporting() && ((L2PcInstance) character).isOnline()) { final InstanceWorld world = InstanceManager.getInstance().getWorld(character); - if ((world != null) && (world.getInstance().getTemplateId() == TEMPLATE_ID)) + if ((world != null) && (world.getTemplateId() == TEMPLATE_ID)) { startQuestTimer("TELEPORT", 1000, null, (L2PcInstance) character); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index 06681c759c..1cb758377a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -871,7 +871,7 @@ public class Q00144_PailakaInjuredDragon extends Quest if ((character instanceof L2PcInstance) && !character.isDead() && !character.isTeleporting() && ((L2PcInstance) character).isOnline()) { final InstanceWorld world = InstanceManager.getInstance().getWorld(character); - if ((world != null) && (world.getInstance().getTemplateId() == INSTANCE_ID)) + if ((world != null) && (world.getTemplateId() == INSTANCE_ID)) { // If a player wants to go by a mob wall without kill it, he will be returned back to a spawn point. final int[] zoneTeleport = NOEXIT_ZONES.get(zone.getId()); @@ -939,7 +939,7 @@ public class Q00144_PailakaInjuredDragon extends Quest InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); if (world != null) { - if (world.getInstance().getTemplateId() != INSTANCE_ID) + if (world.getTemplateId() != INSTANCE_ID) { player.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON); return; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java index 3d4ec93e77..a43903beaf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java @@ -287,8 +287,9 @@ public final class Q00511_AwlUnderFoot extends Quest } final L2Party party = player.getParty(); world = new FAUWorld(); - world.setInstance(InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId())); - world.getInstance().setExitLoc(new Location(player)); + final Instance instance = InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId()); + world.setInstance(instance); + instance.setExitLoc(new Location(player)); dungeon.setReEnterTime(System.currentTimeMillis() + REENTERTIME); InstanceManager.getInstance().addWorld(world); final int instanceId = world.getInstanceId(); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java index b4c655e360..f0dbeaa8d4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java @@ -98,7 +98,7 @@ public final class Q00694_BreakThroughTheHallOfSuffering extends Quest case TEPIOS2: { final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); - if ((world != null) && (world.getInstance().getTemplateId() == TEMPLATE_ID)) + if ((world != null) && (world.getTemplateId() == TEMPLATE_ID)) { final int tag = world.getParameters().getInt("tag", -1); if (tag == -1) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java index 369141e3fc..9ce719effe 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java @@ -107,7 +107,7 @@ public final class Q00695_DefendTheHallOfSuffering extends Quest { final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); - if ((world != null) && (world.getInstance().getTemplateId() == TEMPLATE_ID)) + if ((world != null) && (world.getTemplateId() == TEMPLATE_ID)) { final int tag = world.getParameters().getInt("tag", -1); if (tag == -1) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java index c9b4df73d5..3c79c73afb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java @@ -273,8 +273,9 @@ public class Q00726_LightWithinTheDarkness extends Quest } final L2Party party = player.getParty(); world = new PAWORLD(); - world.setInstance(InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId())); - world.getInstance().setExitLoc(new Location(player)); + final Instance instance = InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId()); + world.setInstance(instance); + instance.setExitLoc(new Location(player)); dungeon.setReEnterTime(System.currentTimeMillis() + 14400000); InstanceManager.getInstance().addWorld(world); ThreadPool.schedule(new spawnNpcs((PAWORLD) world), 10000); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java index 0b31b0c13a..b50d8e98d1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java @@ -625,8 +625,9 @@ public class Q00727_HopeWithinTheDarkness extends Quest final L2Party party = player.getParty(); world = new CAUWorld(); - world.setInstance(InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId())); - world.getInstance().setExitLoc(new Location(player)); + final Instance instance = InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId()); + world.setInstance(instance); + instance.setExitLoc(new Location(player)); final int instanceId = world.getInstanceId(); dungeon.setReEnterTime(System.currentTimeMillis() + REENTER_INTERVAL); InstanceManager.getInstance().addWorld(world); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java index fce219cc2e..e36ee661d8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java @@ -55,6 +55,6 @@ public class ConditionPlayerInstanceId extends Condition } final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(effector.getActingPlayer()); - return (world != null) && (world.getInstanceId() == instanceId) && _instanceIds.contains(world.getInstance().getTemplateId()); + return (world != null) && (world.getInstanceId() == instanceId) && _instanceIds.contains(world.getTemplateId()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/InstanceWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/InstanceWorld.java index ab03a8ccc5..6db2abb2fd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/InstanceWorld.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/InstanceWorld.java @@ -47,15 +47,6 @@ public class InstanceWorld _instance = instance; } - /** - * Gets the instance. - * @return the instance - */ - public Instance getInstance() - { - return _instance; - } - /** * Gets the dynamically generated instance ID. * @return the instance ID @@ -65,6 +56,15 @@ public class InstanceWorld return _instance.getId(); } + /** + * Get template ID of instance world. + * @return instance template ID + */ + public int getTemplateId() + { + return _instance.getTemplateId(); + } + public List getAllowed() { return _allowed; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java index 5e455a2270..c92b7db907 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java @@ -202,7 +202,7 @@ public abstract class L2ZoneType extends ListenersContainer if (_instanceTemplateId > 0) { final InstanceWorld world = InstanceManager.getInstance().getWorld(character); - if ((world != null) && (world.getInstance().getTemplateId() != _instanceTemplateId)) + if ((world != null) && (world.getTemplateId() != _instanceTemplateId)) { return false; }