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

Sync with L2jServer HighFive Apr 10th 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-04-11 07:15:16 +00:00
parent 46669bba9d
commit ebfe860e5a
16 changed files with 221 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
trunk/dist/game/data/scripts/instances/AbstractInstance.java vendored
View File

@@ -74,7 +74,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
return;
}
if (checkConditions(player))
if (checkConditions(player, templateId))
{
instance.setInstanceId(InstanceManager.getInstance().createDynamicInstance(template));
instance.setTemplateId(templateId);
@@ -190,6 +190,11 @@ 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;

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

@@ -201,7 +201,7 @@ public final class CavernOfThePirateCaptain extends AbstractInstance
}
@Override
protected boolean checkConditions(L2PcInstance player)
protected boolean checkConditions(L2PcInstance player, int templateId)
{
if (player.canOverrideCond(PcCondOverride.INSTANCE_CONDITIONS))
{
@@ -214,7 +214,7 @@ public final class CavernOfThePirateCaptain extends AbstractInstance
return false;
}
final boolean is83 = InstanceManager.getInstance().getPlayerWorld(player).getTemplateId() == TEMPLATE_ID_83 ? true : false;
final boolean is83 = templateId == TEMPLATE_ID_83;
final L2Party party = player.getParty();
final boolean isInCC = party.isInCommandChannel();
final List<L2PcInstance> members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers();

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

@@ -1227,7 +1227,7 @@ public final class Kamaloka extends AbstractInstance
* @param index (0-18) index of the kamaloka in arrays
* @return true if party allowed to enter
*/
private static final boolean checkConditions(L2PcInstance player, int index)
private static final boolean checkPartyConditions(L2PcInstance player, int index)
{
final L2Party party = player.getParty();
// player must be in party
@@ -1375,7 +1375,7 @@ public final class Kamaloka extends AbstractInstance
return;
}
// Creating new kamaloka instance
if (!checkConditions(player, index))
if (!checkPartyConditions(player, index))
{
return;
}