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

Use max level config to ensure instance level condition is met.

Browse Source
This commit is contained in:
MobiusDev
2019-02-17 11:22:39 +00:00
parent c666ea53f4
commit b6c59876dc
10 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java
View File

@@ -16,6 +16,7 @@
*/ */
package com.l2jmobius.gameserver.model.instancezone.conditions; package com.l2jmobius.gameserver.model.instancezone.conditions;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -35,8 +36,8 @@ public final class ConditionLevel extends Condition
{ {
super(template, parameters, onlyLeader, showMessageAndHtml); super(template, parameters, onlyLeader, showMessageAndHtml);
// Load params // Load params
_min = parameters.getInt("min", 1); _min = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("min", 1));
_max = parameters.getInt("max", Integer.MAX_VALUE); _max = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("max", Integer.MAX_VALUE));
// Set message // Set message
setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName())); setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName()));
} }

5
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java
View File

@@ -16,6 +16,7 @@
*/ */
package com.l2jmobius.gameserver.model.instancezone.conditions; package com.l2jmobius.gameserver.model.instancezone.conditions;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -35,8 +36,8 @@ public final class ConditionLevel extends Condition
{ {
super(template, parameters, onlyLeader, showMessageAndHtml); super(template, parameters, onlyLeader, showMessageAndHtml);
// Load params // Load params
_min = parameters.getInt("min", 1); _min = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("min", 1));
_max = parameters.getInt("max", Integer.MAX_VALUE); _max = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("max", Integer.MAX_VALUE));
// Set message // Set message
setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName())); setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName()));
} }

5
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java
View File

@@ -16,6 +16,7 @@
*/ */
package com.l2jmobius.gameserver.model.instancezone.conditions; package com.l2jmobius.gameserver.model.instancezone.conditions;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -35,8 +36,8 @@ public final class ConditionLevel extends Condition
{ {
super(template, parameters, onlyLeader, showMessageAndHtml); super(template, parameters, onlyLeader, showMessageAndHtml);
// Load params // Load params
_min = parameters.getInt("min", 1); _min = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("min", 1));
_max = parameters.getInt("max", Integer.MAX_VALUE); _max = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("max", Integer.MAX_VALUE));
// Set message // Set message
setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName())); setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName()));
} }

5
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java
View File

@@ -16,6 +16,7 @@
*/ */
package com.l2jmobius.gameserver.model.instancezone.conditions; package com.l2jmobius.gameserver.model.instancezone.conditions;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -35,8 +36,8 @@ public final class ConditionLevel extends Condition
{ {
super(template, parameters, onlyLeader, showMessageAndHtml); super(template, parameters, onlyLeader, showMessageAndHtml);
// Load params // Load params
_min = parameters.getInt("min", 1); _min = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("min", 1));
_max = parameters.getInt("max", Integer.MAX_VALUE); _max = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("max", Integer.MAX_VALUE));
// Set message // Set message
setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName())); setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName()));
} }

5
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java
View File

@@ -16,6 +16,7 @@
*/ */
package com.l2jmobius.gameserver.model.instancezone.conditions; package com.l2jmobius.gameserver.model.instancezone.conditions;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -35,8 +36,8 @@ public final class ConditionLevel extends Condition
{ {
super(template, parameters, onlyLeader, showMessageAndHtml); super(template, parameters, onlyLeader, showMessageAndHtml);
// Load params // Load params
_min = parameters.getInt("min", 1); _min = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("min", 1));
_max = parameters.getInt("max", Integer.MAX_VALUE); _max = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("max", Integer.MAX_VALUE));
// Set message // Set message
setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName())); setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName()));
} }

5
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java
View File

@@ -16,6 +16,7 @@
*/ */
package com.l2jmobius.gameserver.model.instancezone.conditions; package com.l2jmobius.gameserver.model.instancezone.conditions;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -35,8 +36,8 @@ public final class ConditionLevel extends Condition
{ {
super(template, parameters, onlyLeader, showMessageAndHtml); super(template, parameters, onlyLeader, showMessageAndHtml);
// Load params // Load params
_min = parameters.getInt("min", 1); _min = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("min", 1));
_max = parameters.getInt("max", Integer.MAX_VALUE); _max = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("max", Integer.MAX_VALUE));
// Set message // Set message
setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName())); setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName()));
} }

5
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java
View File

@@ -16,6 +16,7 @@
*/ */
package com.l2jmobius.gameserver.model.instancezone.conditions; package com.l2jmobius.gameserver.model.instancezone.conditions;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -35,8 +36,8 @@ public final class ConditionLevel extends Condition
{ {
super(template, parameters, onlyLeader, showMessageAndHtml); super(template, parameters, onlyLeader, showMessageAndHtml);
// Load params // Load params
_min = parameters.getInt("min", 1); _min = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("min", 1));
_max = parameters.getInt("max", Integer.MAX_VALUE); _max = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("max", Integer.MAX_VALUE));
// Set message // Set message
setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName())); setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName()));
} }

5
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java
View File

@@ -16,6 +16,7 @@
*/ */
package com.l2jmobius.gameserver.model.instancezone.conditions; package com.l2jmobius.gameserver.model.instancezone.conditions;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -35,8 +36,8 @@ public final class ConditionLevel extends Condition
{ {
super(template, parameters, onlyLeader, showMessageAndHtml); super(template, parameters, onlyLeader, showMessageAndHtml);
// Load params // Load params
_min = parameters.getInt("min", 1); _min = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("min", 1));
_max = parameters.getInt("max", Integer.MAX_VALUE); _max = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("max", Integer.MAX_VALUE));
// Set message // Set message
setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName())); setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName()));
} }

5
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java
View File

@@ -16,6 +16,7 @@
*/ */
package com.l2jmobius.gameserver.model.instancezone.conditions; package com.l2jmobius.gameserver.model.instancezone.conditions;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -35,8 +36,8 @@ public final class ConditionLevel extends Condition
{ {
super(template, parameters, onlyLeader, showMessageAndHtml); super(template, parameters, onlyLeader, showMessageAndHtml);
// Load params // Load params
_min = parameters.getInt("min", 1); _min = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("min", 1));
_max = parameters.getInt("max", Integer.MAX_VALUE); _max = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("max", Integer.MAX_VALUE));
// Set message // Set message
setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName())); setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName()));
} }

5
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java
View File

@@ -16,6 +16,7 @@
*/ */
package com.l2jmobius.gameserver.model.instancezone.conditions; package com.l2jmobius.gameserver.model.instancezone.conditions;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -35,8 +36,8 @@ public final class ConditionLevel extends Condition
{ {
super(template, parameters, onlyLeader, showMessageAndHtml); super(template, parameters, onlyLeader, showMessageAndHtml);
// Load params // Load params
_min = parameters.getInt("min", 1); _min = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("min", 1));
_max = parameters.getInt("max", Integer.MAX_VALUE); _max = Math.min(Config.PLAYER_MAXIMUM_LEVEL, parameters.getInt("max", Integer.MAX_VALUE));
// Set message // Set message
setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName())); setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName()));
} }