From 8a9a1d4a61f9bb5853d9da511270c61b74732dff Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 23 Mar 2019 12:12:02 +0000 Subject: [PATCH] Removed admin set level subclass limit when on a dualclass. --- .../data/scripts/handlers/admincommandhandlers/AdminLevel.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminLevel.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminLevel.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminLevel.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminLevel.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminLevel.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminLevel.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminLevel.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminLevel.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminLevel.java | 2 +- .../data/scripts/handlers/admincommandhandlers/AdminLevel.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java index fff76953b1..7117220e02 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java @@ -72,7 +72,7 @@ public class AdminLevel implements IAdminCommandHandler final L2PcInstance targetPlayer = targetChar.getActingPlayer(); int maxLevel = ExperienceData.getInstance().getMaxLevel(); - if (targetPlayer.isSubClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) + if (targetPlayer.isSubClassActive() && !targetPlayer.isDualClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) { maxLevel = Config.MAX_SUBCLASS_LEVEL; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java index fff76953b1..7117220e02 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java @@ -72,7 +72,7 @@ public class AdminLevel implements IAdminCommandHandler final L2PcInstance targetPlayer = targetChar.getActingPlayer(); int maxLevel = ExperienceData.getInstance().getMaxLevel(); - if (targetPlayer.isSubClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) + if (targetPlayer.isSubClassActive() && !targetPlayer.isDualClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) { maxLevel = Config.MAX_SUBCLASS_LEVEL; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java index fff76953b1..7117220e02 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java @@ -72,7 +72,7 @@ public class AdminLevel implements IAdminCommandHandler final L2PcInstance targetPlayer = targetChar.getActingPlayer(); int maxLevel = ExperienceData.getInstance().getMaxLevel(); - if (targetPlayer.isSubClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) + if (targetPlayer.isSubClassActive() && !targetPlayer.isDualClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) { maxLevel = Config.MAX_SUBCLASS_LEVEL; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java index fff76953b1..7117220e02 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java @@ -72,7 +72,7 @@ public class AdminLevel implements IAdminCommandHandler final L2PcInstance targetPlayer = targetChar.getActingPlayer(); int maxLevel = ExperienceData.getInstance().getMaxLevel(); - if (targetPlayer.isSubClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) + if (targetPlayer.isSubClassActive() && !targetPlayer.isDualClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) { maxLevel = Config.MAX_SUBCLASS_LEVEL; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java index fff76953b1..7117220e02 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java @@ -72,7 +72,7 @@ public class AdminLevel implements IAdminCommandHandler final L2PcInstance targetPlayer = targetChar.getActingPlayer(); int maxLevel = ExperienceData.getInstance().getMaxLevel(); - if (targetPlayer.isSubClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) + if (targetPlayer.isSubClassActive() && !targetPlayer.isDualClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) { maxLevel = Config.MAX_SUBCLASS_LEVEL; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java index fff76953b1..7117220e02 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java @@ -72,7 +72,7 @@ public class AdminLevel implements IAdminCommandHandler final L2PcInstance targetPlayer = targetChar.getActingPlayer(); int maxLevel = ExperienceData.getInstance().getMaxLevel(); - if (targetPlayer.isSubClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) + if (targetPlayer.isSubClassActive() && !targetPlayer.isDualClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) { maxLevel = Config.MAX_SUBCLASS_LEVEL; } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java index fff76953b1..7117220e02 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java @@ -72,7 +72,7 @@ public class AdminLevel implements IAdminCommandHandler final L2PcInstance targetPlayer = targetChar.getActingPlayer(); int maxLevel = ExperienceData.getInstance().getMaxLevel(); - if (targetPlayer.isSubClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) + if (targetPlayer.isSubClassActive() && !targetPlayer.isDualClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) { maxLevel = Config.MAX_SUBCLASS_LEVEL; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java index fff76953b1..7117220e02 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java @@ -72,7 +72,7 @@ public class AdminLevel implements IAdminCommandHandler final L2PcInstance targetPlayer = targetChar.getActingPlayer(); int maxLevel = ExperienceData.getInstance().getMaxLevel(); - if (targetPlayer.isSubClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) + if (targetPlayer.isSubClassActive() && !targetPlayer.isDualClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) { maxLevel = Config.MAX_SUBCLASS_LEVEL; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java index fff76953b1..7117220e02 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java @@ -72,7 +72,7 @@ public class AdminLevel implements IAdminCommandHandler final L2PcInstance targetPlayer = targetChar.getActingPlayer(); int maxLevel = ExperienceData.getInstance().getMaxLevel(); - if (targetPlayer.isSubClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) + if (targetPlayer.isSubClassActive() && !targetPlayer.isDualClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) { maxLevel = Config.MAX_SUBCLASS_LEVEL; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java index fff76953b1..7117220e02 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java @@ -72,7 +72,7 @@ public class AdminLevel implements IAdminCommandHandler final L2PcInstance targetPlayer = targetChar.getActingPlayer(); int maxLevel = ExperienceData.getInstance().getMaxLevel(); - if (targetPlayer.isSubClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) + if (targetPlayer.isSubClassActive() && !targetPlayer.isDualClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) { maxLevel = Config.MAX_SUBCLASS_LEVEL; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java index fff76953b1..7117220e02 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java @@ -72,7 +72,7 @@ public class AdminLevel implements IAdminCommandHandler final L2PcInstance targetPlayer = targetChar.getActingPlayer(); int maxLevel = ExperienceData.getInstance().getMaxLevel(); - if (targetPlayer.isSubClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) + if (targetPlayer.isSubClassActive() && !targetPlayer.isDualClassActive() && (Config.MAX_SUBCLASS_LEVEL < maxLevel)) { maxLevel = Config.MAX_SUBCLASS_LEVEL; }