From 6021d7348ce7d31f66998db8afdc794405cc7cd5 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 25 Sep 2022 23:09:46 +0000 Subject: [PATCH] Removal of unused Allowed Player Races configuration. --- .../game/config/Custom/AllowedPlayerRaces.ini | 2 -- .../java/org/l2jmobius/Config.java | 4 ---- .../network/clientpackets/CharacterCreate.java | 18 ------------------ .../game/config/Custom/AllowedPlayerRaces.ini | 2 -- .../java/org/l2jmobius/Config.java | 4 ---- .../network/clientpackets/CharacterCreate.java | 18 ------------------ .../game/config/Custom/AllowedPlayerRaces.ini | 2 -- .../java/org/l2jmobius/Config.java | 4 ---- .../network/clientpackets/CharacterCreate.java | 18 ------------------ .../game/config/Custom/AllowedPlayerRaces.ini | 2 -- .../java/org/l2jmobius/Config.java | 4 ---- .../network/clientpackets/CharacterCreate.java | 18 ------------------ .../game/config/Custom/AllowedPlayerRaces.ini | 2 -- .../java/org/l2jmobius/Config.java | 4 ---- .../network/clientpackets/CharacterCreate.java | 18 ------------------ .../game/config/Custom/AllowedPlayerRaces.ini | 2 -- .../java/org/l2jmobius/Config.java | 4 ---- .../network/clientpackets/CharacterCreate.java | 18 ------------------ .../game/config/Custom/AllowedPlayerRaces.ini | 2 -- .../java/org/l2jmobius/Config.java | 4 ---- .../network/clientpackets/CharacterCreate.java | 18 ------------------ .../game/config/Custom/AllowedPlayerRaces.ini | 2 -- .../java/org/l2jmobius/Config.java | 4 ---- .../network/clientpackets/CharacterCreate.java | 18 ------------------ .../game/config/Custom/AllowedPlayerRaces.ini | 1 - .../java/org/l2jmobius/Config.java | 2 -- .../network/clientpackets/CharacterCreate.java | 9 --------- .../game/config/Custom/AllowedPlayerRaces.ini | 2 -- .../java/org/l2jmobius/Config.java | 4 ---- .../network/clientpackets/CharacterCreate.java | 18 ------------------ 30 files changed, 228 deletions(-) diff --git a/L2J_Mobius_Classic_1.0/dist/game/config/Custom/AllowedPlayerRaces.ini b/L2J_Mobius_Classic_1.0/dist/game/config/Custom/AllowedPlayerRaces.ini index 535a68d693..dd31973155 100644 --- a/L2J_Mobius_Classic_1.0/dist/game/config/Custom/AllowedPlayerRaces.ini +++ b/L2J_Mobius_Classic_1.0/dist/game/config/Custom/AllowedPlayerRaces.ini @@ -9,5 +9,3 @@ AllowElf = True AllowDarkElf = True AllowOrc = True AllowDwarf = True -AllowKamael = True -AllowErtheia = True diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/Config.java index 76b4fe3d9b..d26e7436c6 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/Config.java @@ -1159,8 +1159,6 @@ public class Config public static boolean ALLOW_DARKELF; public static boolean ALLOW_ORC; public static boolean ALLOW_DWARF; - public static boolean ALLOW_KAMAEL; - public static boolean ALLOW_ERTHEIA; public static boolean AUTO_POTIONS_ENABLED; public static boolean AUTO_POTIONS_IN_OLYMPIAD; public static int AUTO_POTION_MIN_LEVEL; @@ -2431,8 +2429,6 @@ public class Config ALLOW_DARKELF = allowedPlayerRacesConfig.getBoolean("AllowDarkElf", true); ALLOW_ORC = allowedPlayerRacesConfig.getBoolean("AllowOrc", true); ALLOW_DWARF = allowedPlayerRacesConfig.getBoolean("AllowDwarf", true); - ALLOW_KAMAEL = allowedPlayerRacesConfig.getBoolean("AllowKamael", true); - ALLOW_ERTHEIA = allowedPlayerRacesConfig.getBoolean("AllowErtheia", true); // Load AutoPotions config file (if exists) final PropertiesParser autoPotionsConfig = new PropertiesParser(CUSTOM_AUTO_POTIONS_CONFIG_FILE); diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index bd7c87310f..0d91e56312 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -220,24 +220,6 @@ public class CharacterCreate implements IClientIncomingPacket } break; } - case KAMAEL: - { - if (!Config.ALLOW_KAMAEL) - { - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); - return; - } - break; - } - case ERTHEIA: - { - if (!Config.ALLOW_ERTHEIA) - { - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); - return; - } - break; - } } newChar = Player.create(template, client.getAccountName(), _name, new PlayerAppearance(_face, _hairColor, _hairStyle, _sex != 0)); } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/Custom/AllowedPlayerRaces.ini b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/Custom/AllowedPlayerRaces.ini index 535a68d693..dd31973155 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/Custom/AllowedPlayerRaces.ini +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/config/Custom/AllowedPlayerRaces.ini @@ -9,5 +9,3 @@ AllowElf = True AllowDarkElf = True AllowOrc = True AllowDwarf = True -AllowKamael = True -AllowErtheia = True diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/Config.java index 35a1d17869..7184b3d7ca 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/Config.java @@ -1169,8 +1169,6 @@ public class Config public static boolean ALLOW_DARKELF; public static boolean ALLOW_ORC; public static boolean ALLOW_DWARF; - public static boolean ALLOW_KAMAEL; - public static boolean ALLOW_ERTHEIA; public static boolean AUTO_POTIONS_ENABLED; public static boolean AUTO_POTIONS_IN_OLYMPIAD; public static int AUTO_POTION_MIN_LEVEL; @@ -2460,8 +2458,6 @@ public class Config ALLOW_DARKELF = allowedPlayerRacesConfig.getBoolean("AllowDarkElf", true); ALLOW_ORC = allowedPlayerRacesConfig.getBoolean("AllowOrc", true); ALLOW_DWARF = allowedPlayerRacesConfig.getBoolean("AllowDwarf", true); - ALLOW_KAMAEL = allowedPlayerRacesConfig.getBoolean("AllowKamael", true); - ALLOW_ERTHEIA = allowedPlayerRacesConfig.getBoolean("AllowErtheia", true); // Load AutoPotions config file (if exists) final PropertiesParser autoPotionsConfig = new PropertiesParser(CUSTOM_AUTO_POTIONS_CONFIG_FILE); diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index bd7c87310f..0d91e56312 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -220,24 +220,6 @@ public class CharacterCreate implements IClientIncomingPacket } break; } - case KAMAEL: - { - if (!Config.ALLOW_KAMAEL) - { - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); - return; - } - break; - } - case ERTHEIA: - { - if (!Config.ALLOW_ERTHEIA) - { - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); - return; - } - break; - } } newChar = Player.create(template, client.getAccountName(), _name, new PlayerAppearance(_face, _hairColor, _hairStyle, _sex != 0)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/AllowedPlayerRaces.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/AllowedPlayerRaces.ini index 535a68d693..dd31973155 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/AllowedPlayerRaces.ini +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Custom/AllowedPlayerRaces.ini @@ -9,5 +9,3 @@ AllowElf = True AllowDarkElf = True AllowOrc = True AllowDwarf = True -AllowKamael = True -AllowErtheia = True diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java index 6796222391..056fb06006 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java @@ -1172,8 +1172,6 @@ public class Config public static boolean ALLOW_DARKELF; public static boolean ALLOW_ORC; public static boolean ALLOW_DWARF; - public static boolean ALLOW_KAMAEL; - public static boolean ALLOW_ERTHEIA; public static boolean AUTO_POTIONS_ENABLED; public static boolean AUTO_POTIONS_IN_OLYMPIAD; public static int AUTO_POTION_MIN_LEVEL; @@ -2466,8 +2464,6 @@ public class Config ALLOW_DARKELF = allowedPlayerRacesConfig.getBoolean("AllowDarkElf", true); ALLOW_ORC = allowedPlayerRacesConfig.getBoolean("AllowOrc", true); ALLOW_DWARF = allowedPlayerRacesConfig.getBoolean("AllowDwarf", true); - ALLOW_KAMAEL = allowedPlayerRacesConfig.getBoolean("AllowKamael", true); - ALLOW_ERTHEIA = allowedPlayerRacesConfig.getBoolean("AllowErtheia", true); // Load AutoPotions config file (if exists) final PropertiesParser autoPotionsConfig = new PropertiesParser(CUSTOM_AUTO_POTIONS_CONFIG_FILE); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index bd7c87310f..0d91e56312 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -220,24 +220,6 @@ public class CharacterCreate implements IClientIncomingPacket } break; } - case KAMAEL: - { - if (!Config.ALLOW_KAMAEL) - { - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); - return; - } - break; - } - case ERTHEIA: - { - if (!Config.ALLOW_ERTHEIA) - { - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); - return; - } - break; - } } newChar = Player.create(template, client.getAccountName(), _name, new PlayerAppearance(_face, _hairColor, _hairStyle, _sex != 0)); } diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/Custom/AllowedPlayerRaces.ini b/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/Custom/AllowedPlayerRaces.ini index 535a68d693..dd31973155 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/Custom/AllowedPlayerRaces.ini +++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/config/Custom/AllowedPlayerRaces.ini @@ -9,5 +9,3 @@ AllowElf = True AllowDarkElf = True AllowOrc = True AllowDwarf = True -AllowKamael = True -AllowErtheia = True diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/Config.java index d71964aa1f..a7401f0ad3 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/Config.java @@ -1176,8 +1176,6 @@ public class Config public static boolean ALLOW_DARKELF; public static boolean ALLOW_ORC; public static boolean ALLOW_DWARF; - public static boolean ALLOW_KAMAEL; - public static boolean ALLOW_ERTHEIA; public static boolean AUTO_POTIONS_ENABLED; public static boolean AUTO_POTIONS_IN_OLYMPIAD; public static int AUTO_POTION_MIN_LEVEL; @@ -2472,8 +2470,6 @@ public class Config ALLOW_DARKELF = allowedPlayerRacesConfig.getBoolean("AllowDarkElf", true); ALLOW_ORC = allowedPlayerRacesConfig.getBoolean("AllowOrc", true); ALLOW_DWARF = allowedPlayerRacesConfig.getBoolean("AllowDwarf", true); - ALLOW_KAMAEL = allowedPlayerRacesConfig.getBoolean("AllowKamael", true); - ALLOW_ERTHEIA = allowedPlayerRacesConfig.getBoolean("AllowErtheia", true); // Load AutoPotions config file (if exists) final PropertiesParser autoPotionsConfig = new PropertiesParser(CUSTOM_AUTO_POTIONS_CONFIG_FILE); diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index bd7c87310f..0d91e56312 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -220,24 +220,6 @@ public class CharacterCreate implements IClientIncomingPacket } break; } - case KAMAEL: - { - if (!Config.ALLOW_KAMAEL) - { - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); - return; - } - break; - } - case ERTHEIA: - { - if (!Config.ALLOW_ERTHEIA) - { - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); - return; - } - break; - } } newChar = Player.create(template, client.getAccountName(), _name, new PlayerAppearance(_face, _hairColor, _hairStyle, _sex != 0)); } diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/Custom/AllowedPlayerRaces.ini b/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/Custom/AllowedPlayerRaces.ini index 535a68d693..dd31973155 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/Custom/AllowedPlayerRaces.ini +++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/config/Custom/AllowedPlayerRaces.ini @@ -9,5 +9,3 @@ AllowElf = True AllowDarkElf = True AllowOrc = True AllowDwarf = True -AllowKamael = True -AllowErtheia = True diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/Config.java index d71964aa1f..a7401f0ad3 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/Config.java @@ -1176,8 +1176,6 @@ public class Config public static boolean ALLOW_DARKELF; public static boolean ALLOW_ORC; public static boolean ALLOW_DWARF; - public static boolean ALLOW_KAMAEL; - public static boolean ALLOW_ERTHEIA; public static boolean AUTO_POTIONS_ENABLED; public static boolean AUTO_POTIONS_IN_OLYMPIAD; public static int AUTO_POTION_MIN_LEVEL; @@ -2472,8 +2470,6 @@ public class Config ALLOW_DARKELF = allowedPlayerRacesConfig.getBoolean("AllowDarkElf", true); ALLOW_ORC = allowedPlayerRacesConfig.getBoolean("AllowOrc", true); ALLOW_DWARF = allowedPlayerRacesConfig.getBoolean("AllowDwarf", true); - ALLOW_KAMAEL = allowedPlayerRacesConfig.getBoolean("AllowKamael", true); - ALLOW_ERTHEIA = allowedPlayerRacesConfig.getBoolean("AllowErtheia", true); // Load AutoPotions config file (if exists) final PropertiesParser autoPotionsConfig = new PropertiesParser(CUSTOM_AUTO_POTIONS_CONFIG_FILE); diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index bd7c87310f..0d91e56312 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -220,24 +220,6 @@ public class CharacterCreate implements IClientIncomingPacket } break; } - case KAMAEL: - { - if (!Config.ALLOW_KAMAEL) - { - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); - return; - } - break; - } - case ERTHEIA: - { - if (!Config.ALLOW_ERTHEIA) - { - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); - return; - } - break; - } } newChar = Player.create(template, client.getAccountName(), _name, new PlayerAppearance(_face, _hairColor, _hairStyle, _sex != 0)); } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/Custom/AllowedPlayerRaces.ini b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/Custom/AllowedPlayerRaces.ini index 535a68d693..dd31973155 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/Custom/AllowedPlayerRaces.ini +++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/config/Custom/AllowedPlayerRaces.ini @@ -9,5 +9,3 @@ AllowElf = True AllowDarkElf = True AllowOrc = True AllowDwarf = True -AllowKamael = True -AllowErtheia = True diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/Config.java index d71964aa1f..a7401f0ad3 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/Config.java @@ -1176,8 +1176,6 @@ public class Config public static boolean ALLOW_DARKELF; public static boolean ALLOW_ORC; public static boolean ALLOW_DWARF; - public static boolean ALLOW_KAMAEL; - public static boolean ALLOW_ERTHEIA; public static boolean AUTO_POTIONS_ENABLED; public static boolean AUTO_POTIONS_IN_OLYMPIAD; public static int AUTO_POTION_MIN_LEVEL; @@ -2472,8 +2470,6 @@ public class Config ALLOW_DARKELF = allowedPlayerRacesConfig.getBoolean("AllowDarkElf", true); ALLOW_ORC = allowedPlayerRacesConfig.getBoolean("AllowOrc", true); ALLOW_DWARF = allowedPlayerRacesConfig.getBoolean("AllowDwarf", true); - ALLOW_KAMAEL = allowedPlayerRacesConfig.getBoolean("AllowKamael", true); - ALLOW_ERTHEIA = allowedPlayerRacesConfig.getBoolean("AllowErtheia", true); // Load AutoPotions config file (if exists) final PropertiesParser autoPotionsConfig = new PropertiesParser(CUSTOM_AUTO_POTIONS_CONFIG_FILE); diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index bd7c87310f..0d91e56312 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -220,24 +220,6 @@ public class CharacterCreate implements IClientIncomingPacket } break; } - case KAMAEL: - { - if (!Config.ALLOW_KAMAEL) - { - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); - return; - } - break; - } - case ERTHEIA: - { - if (!Config.ALLOW_ERTHEIA) - { - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); - return; - } - break; - } } newChar = Player.create(template, client.getAccountName(), _name, new PlayerAppearance(_face, _hairColor, _hairStyle, _sex != 0)); } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/Custom/AllowedPlayerRaces.ini b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/Custom/AllowedPlayerRaces.ini index 535a68d693..dd31973155 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/Custom/AllowedPlayerRaces.ini +++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/config/Custom/AllowedPlayerRaces.ini @@ -9,5 +9,3 @@ AllowElf = True AllowDarkElf = True AllowOrc = True AllowDwarf = True -AllowKamael = True -AllowErtheia = True diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/Config.java index 8cfcafb522..b531d9bbff 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/Config.java @@ -1188,8 +1188,6 @@ public class Config public static boolean ALLOW_DARKELF; public static boolean ALLOW_ORC; public static boolean ALLOW_DWARF; - public static boolean ALLOW_KAMAEL; - public static boolean ALLOW_ERTHEIA; public static boolean AUTO_POTIONS_ENABLED; public static boolean AUTO_POTIONS_IN_OLYMPIAD; public static int AUTO_POTION_MIN_LEVEL; @@ -2528,8 +2526,6 @@ public class Config ALLOW_DARKELF = allowedPlayerRacesConfig.getBoolean("AllowDarkElf", true); ALLOW_ORC = allowedPlayerRacesConfig.getBoolean("AllowOrc", true); ALLOW_DWARF = allowedPlayerRacesConfig.getBoolean("AllowDwarf", true); - ALLOW_KAMAEL = allowedPlayerRacesConfig.getBoolean("AllowKamael", true); - ALLOW_ERTHEIA = allowedPlayerRacesConfig.getBoolean("AllowErtheia", true); // Load AutoPotions config file (if exists) final PropertiesParser autoPotionsConfig = new PropertiesParser(CUSTOM_AUTO_POTIONS_CONFIG_FILE); diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index bd7c87310f..0d91e56312 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -220,24 +220,6 @@ public class CharacterCreate implements IClientIncomingPacket } break; } - case KAMAEL: - { - if (!Config.ALLOW_KAMAEL) - { - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); - return; - } - break; - } - case ERTHEIA: - { - if (!Config.ALLOW_ERTHEIA) - { - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); - return; - } - break; - } } newChar = Player.create(template, client.getAccountName(), _name, new PlayerAppearance(_face, _hairColor, _hairStyle, _sex != 0)); } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/Custom/AllowedPlayerRaces.ini b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/Custom/AllowedPlayerRaces.ini index 535a68d693..dd31973155 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/Custom/AllowedPlayerRaces.ini +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/config/Custom/AllowedPlayerRaces.ini @@ -9,5 +9,3 @@ AllowElf = True AllowDarkElf = True AllowOrc = True AllowDwarf = True -AllowKamael = True -AllowErtheia = True diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/Config.java index e1ef7baa2d..8ae11b9f45 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/Config.java @@ -1181,8 +1181,6 @@ public class Config public static boolean ALLOW_DARKELF; public static boolean ALLOW_ORC; public static boolean ALLOW_DWARF; - public static boolean ALLOW_KAMAEL; - public static boolean ALLOW_ERTHEIA; public static boolean AUTO_POTIONS_ENABLED; public static boolean AUTO_POTIONS_IN_OLYMPIAD; public static int AUTO_POTION_MIN_LEVEL; @@ -2481,8 +2479,6 @@ public class Config ALLOW_DARKELF = allowedPlayerRacesConfig.getBoolean("AllowDarkElf", true); ALLOW_ORC = allowedPlayerRacesConfig.getBoolean("AllowOrc", true); ALLOW_DWARF = allowedPlayerRacesConfig.getBoolean("AllowDwarf", true); - ALLOW_KAMAEL = allowedPlayerRacesConfig.getBoolean("AllowKamael", true); - ALLOW_ERTHEIA = allowedPlayerRacesConfig.getBoolean("AllowErtheia", true); // Load AutoPotions config file (if exists) final PropertiesParser autoPotionsConfig = new PropertiesParser(CUSTOM_AUTO_POTIONS_CONFIG_FILE); diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index bd7c87310f..0d91e56312 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -220,24 +220,6 @@ public class CharacterCreate implements IClientIncomingPacket } break; } - case KAMAEL: - { - if (!Config.ALLOW_KAMAEL) - { - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); - return; - } - break; - } - case ERTHEIA: - { - if (!Config.ALLOW_ERTHEIA) - { - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); - return; - } - break; - } } newChar = Player.create(template, client.getAccountName(), _name, new PlayerAppearance(_face, _hairColor, _hairStyle, _sex != 0)); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Custom/AllowedPlayerRaces.ini b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Custom/AllowedPlayerRaces.ini index 535a68d693..c3ba4ec6df 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Custom/AllowedPlayerRaces.ini +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Custom/AllowedPlayerRaces.ini @@ -10,4 +10,3 @@ AllowDarkElf = True AllowOrc = True AllowDwarf = True AllowKamael = True -AllowErtheia = True diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java index f917a1c1ae..21863fc8bd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java @@ -1188,7 +1188,6 @@ public class Config public static boolean ALLOW_ORC; public static boolean ALLOW_DWARF; public static boolean ALLOW_KAMAEL; - public static boolean ALLOW_ERTHEIA; public static boolean AUTO_POTIONS_ENABLED; public static boolean AUTO_POTIONS_IN_OLYMPIAD; public static int AUTO_POTION_MIN_LEVEL; @@ -2527,7 +2526,6 @@ public class Config ALLOW_ORC = allowedPlayerRacesConfig.getBoolean("AllowOrc", true); ALLOW_DWARF = allowedPlayerRacesConfig.getBoolean("AllowDwarf", true); ALLOW_KAMAEL = allowedPlayerRacesConfig.getBoolean("AllowKamael", true); - ALLOW_ERTHEIA = allowedPlayerRacesConfig.getBoolean("AllowErtheia", true); // Load AutoPotions config file (if exists) final PropertiesParser autoPotionsConfig = new PropertiesParser(CUSTOM_AUTO_POTIONS_CONFIG_FILE); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index bd7c87310f..7485125cf8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -229,15 +229,6 @@ public class CharacterCreate implements IClientIncomingPacket } break; } - case ERTHEIA: - { - if (!Config.ALLOW_ERTHEIA) - { - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); - return; - } - break; - } } newChar = Player.create(template, client.getAccountName(), _name, new PlayerAppearance(_face, _hairColor, _hairStyle, _sex != 0)); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/config/Custom/AllowedPlayerRaces.ini b/L2J_Mobius_Classic_Interlude/dist/game/config/Custom/AllowedPlayerRaces.ini index 535a68d693..dd31973155 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/config/Custom/AllowedPlayerRaces.ini +++ b/L2J_Mobius_Classic_Interlude/dist/game/config/Custom/AllowedPlayerRaces.ini @@ -9,5 +9,3 @@ AllowElf = True AllowDarkElf = True AllowOrc = True AllowDwarf = True -AllowKamael = True -AllowErtheia = True diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java index dc98221c6e..990721cee4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java @@ -1188,8 +1188,6 @@ public class Config public static boolean ALLOW_DARKELF; public static boolean ALLOW_ORC; public static boolean ALLOW_DWARF; - public static boolean ALLOW_KAMAEL; - public static boolean ALLOW_ERTHEIA; public static boolean AUTO_POTIONS_ENABLED; public static boolean AUTO_POTIONS_IN_OLYMPIAD; public static int AUTO_POTION_MIN_LEVEL; @@ -2486,8 +2484,6 @@ public class Config ALLOW_DARKELF = allowedPlayerRacesConfig.getBoolean("AllowDarkElf", true); ALLOW_ORC = allowedPlayerRacesConfig.getBoolean("AllowOrc", true); ALLOW_DWARF = allowedPlayerRacesConfig.getBoolean("AllowDwarf", true); - ALLOW_KAMAEL = allowedPlayerRacesConfig.getBoolean("AllowKamael", true); - ALLOW_ERTHEIA = allowedPlayerRacesConfig.getBoolean("AllowErtheia", true); // Load AutoPotions config file (if exists) final PropertiesParser autoPotionsConfig = new PropertiesParser(CUSTOM_AUTO_POTIONS_CONFIG_FILE); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index bd7c87310f..0d91e56312 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -220,24 +220,6 @@ public class CharacterCreate implements IClientIncomingPacket } break; } - case KAMAEL: - { - if (!Config.ALLOW_KAMAEL) - { - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); - return; - } - break; - } - case ERTHEIA: - { - if (!Config.ALLOW_ERTHEIA) - { - client.sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED)); - return; - } - break; - } } newChar = Player.create(template, client.getAccountName(), _name, new PlayerAppearance(_face, _hairColor, _hairStyle, _sex != 0)); }