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

Sync with L2jServer HighFive Nov 14th 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-11-14 16:31:37 +00:00
parent 887fbcc6b5
commit e38353e409
125 changed files with 1998 additions and 1419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java vendored
View File

@ -425,7 +425,7 @@ public abstract class Chamber extends AbstractInstance
return;
}
final Instance inst = InstanceManager.getInstance().getInstance(player.getInstanceId());
Location ret = inst.getSpawnLoc();
Location ret = inst.getExitLoc();
final String return_point = player.getVariables().getString(RETURN, null);
if (return_point != null)
{

4
trunk/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java vendored
View File

@ -1386,7 +1386,7 @@ public final class Kamaloka extends AbstractInstance
// set name for the kamaloka
inst.setName(InstanceManager.getInstance().getInstanceIdName(templateId));
// set return location
inst.setSpawnLoc(new Location(player));
inst.setExitLoc(new Location(player));
// disable summon friend into instance
inst.setAllowSummon(false);
// set duration and empty destroy time
@ -1577,7 +1577,7 @@ public final class Kamaloka extends AbstractInstance
{
if ((partyMember != null) && (partyMember.getInstanceId() == world.getInstanceId()))
{
teleportPlayer(partyMember, inst.getSpawnLoc(), 0);
teleportPlayer(partyMember, inst.getExitLoc(), 0);
}
}
}

2
trunk/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java vendored
View File

@ -282,7 +282,7 @@ public final class NornilsGarden extends AbstractInstance
final Instance inst = InstanceManager.getInstance().getInstance(instanceId);
inst.setName(InstanceManager.getInstance().getInstanceIdName(TEMPLATE_ID));
inst.setSpawnLoc(new Location(player));
inst.setExitLoc(new Location(player));
inst.setAllowSummon(false);
inst.setDuration(DURATION_TIME * 60000);
inst.setEmptyDestroyTime(EMPTY_DESTROY_TIME * 60000);