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

Enable use of spawnPoints instance template parameter.

Browse Source
This commit is contained in:
MobiusDev
2018-08-08 20:09:50 +00:00
parent ce505a7166
commit 16e1cfc371
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,6 +60,10 @@ public abstract class AbstractInstance extends AbstractNpcAI
{ {
handleRemoveBuffs(player, world); handleRemoveBuffs(player, world);
} }
if (!inst.getEnterLocs().isEmpty())
{
teleportPlayer(player, inst.getEnterLocs().get(getRandom(inst.getEnterLocs().size())), world.getInstanceId(), false);
}
return; return;
} }
player.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON); player.sendPacket(SystemMessageId.YOU_HAVE_ENTERED_ANOTHER_INSTANCE_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON);
@@ -78,11 +82,14 @@ public abstract class AbstractInstance extends AbstractNpcAI
{ {
handleReenterTime(instance); handleReenterTime(instance);
} }
if (inst.isRemoveBuffEnabled()) if (inst.isRemoveBuffEnabled())
{ {
handleRemoveBuffs(instance); handleRemoveBuffs(instance);
} }
if (!inst.getEnterLocs().isEmpty())
{
teleportPlayer(player, inst.getEnterLocs().get(getRandom(inst.getEnterLocs().size())), instance.getInstanceId(), false);
}
} }
} }

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/Instance.java
View File

@@ -77,7 +77,7 @@ public final class Instance
private final List<StatsSet> _doorTemplates = new CopyOnWriteArrayList<>(); private final List<StatsSet> _doorTemplates = new CopyOnWriteArrayList<>();
private final Map<Integer, L2DoorInstance> _doors = new ConcurrentHashMap<>(); private final Map<Integer, L2DoorInstance> _doors = new ConcurrentHashMap<>();
private final List<StatsSet> _spawnTemplates = new CopyOnWriteArrayList<>(); private final List<StatsSet> _spawnTemplates = new CopyOnWriteArrayList<>();
private List<Location> _enterLocations = null; private List<Location> _enterLocations = new CopyOnWriteArrayList<>();
private Location _exitLocation = null; private Location _exitLocation = null;
private boolean _allowSummon = true; private boolean _allowSummon = true;
private long _emptyDestroyTime = -1; private long _emptyDestroyTime = -1;