diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Access.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Access.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Access.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Access.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Character.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Character.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Character.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Character.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Clanhall.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Clanhall.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Clanhall.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Clanhall.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/ConquerableClanHalls.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/ConquerableHallSiege.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/ConquerableClanHalls.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/ConquerableHallSiege.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Crafting.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Crafting.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Crafting.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Crafting.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Enchant.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Enchant.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Enchant.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Enchant.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/protected/FloodProtector.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/FloodProtector.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/protected/FloodProtector.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/FloodProtector.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Fort.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/FortSiege.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Fort.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/FortSiege.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/General.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/General.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/General.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/General.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/GeoEngine.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/GeoEngine.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/GeoEngine.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/GeoEngine.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/RaidBoss.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/GrandBoss.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/RaidBoss.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/GrandBoss.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Olympiad.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Olympiad.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Olympiad.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Olympiad.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/protected/Other.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Other.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/protected/Other.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Other.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/PvP.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/PvP.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/PvP.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/PvP.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Rates.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Rates.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Rates.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Rates.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/protected/ScriptEngine.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/ScriptEngine.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/protected/ScriptEngine.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/ScriptEngine.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/protected/Scripts.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Scripts.xml similarity index 92% rename from L2J_Mobius_C6_Interlude/dist/game/config/protected/Scripts.xml rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Scripts.xml index b04ede5547..45b1a08bc0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/config/protected/Scripts.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Scripts.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Server.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Server.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Server.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Server.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/SevenSigns.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/SevenSigns.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/SevenSigns.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/SevenSigns.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Siege.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Siege.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Siege.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Siege.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/protected/Telnet.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Telnet.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/protected/Telnet.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/Telnet.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/ClassDamage.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/custom/ClassDamage.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/ClassDamage.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/custom/ClassDamage.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/events/PcBang.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/custom/PcBang.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/events/PcBang.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/custom/PcBang.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Physics.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/custom/PhysicsBalance.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/main/Physics.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/custom/PhysicsBalance.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/others/banned_ip.cfg b/L2J_Mobius_C4_ScionsOfDestiny/dist/login/banned_ip.cfg similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/others/banned_ip.cfg rename to L2J_Mobius_C4_ScionsOfDestiny/dist/login/banned_ip.cfg diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/protected/Telnet.ini b/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/Telnet.ini similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/protected/Telnet.ini rename to L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/Telnet.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/others/banned_ip.cfg b/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/others/banned_ip.cfg deleted file mode 100644 index ee951522b4..0000000000 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/others/banned_ip.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# Subnets can be defined like 123.45.0.0 -# Comments after # are ignored -# Expiration timestamp can be added after IP for when to disable the ban -# Example: -# 192.168.0.0 1237618800000 # Bans all address starting with 192.168 and will expire on 21 Mar 2009 07:00:00 GMT -10.255.255.255 -10.254.254.254 diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/others/servername.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/others/servername.xml deleted file mode 100644 index 2006704401..0000000000 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/others/servername.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/others/servername.xsd b/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/others/servername.xsd deleted file mode 100644 index 1a1ca24033..0000000000 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/login/config/others/servername.xsd +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/others/servername.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/login/data/servername.xml similarity index 96% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/others/servername.xml rename to L2J_Mobius_C4_ScionsOfDestiny/dist/login/data/servername.xml index 2006704401..6cae663f9f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/others/servername.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/login/data/servername.xml @@ -1,4 +1,4 @@ - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/others/servername.xsd b/L2J_Mobius_C4_ScionsOfDestiny/dist/login/data/servername.xsd similarity index 100% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/others/servername.xsd rename to L2J_Mobius_C4_ScionsOfDestiny/dist/login/data/servername.xsd diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java index 4fa8b57697..8760b67a8b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java @@ -18,12 +18,9 @@ package org.l2jmobius; import java.io.BufferedReader; import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; -import java.io.InputStreamReader; import java.io.LineNumberReader; import java.io.OutputStream; import java.math.BigInteger; @@ -45,7 +42,6 @@ import org.l2jmobius.gameserver.enums.GeoType; import org.l2jmobius.gameserver.model.olympiad.OlympiadPeriod; import org.l2jmobius.gameserver.util.FloodProtectorConfig; import org.l2jmobius.gameserver.util.Util; -import org.l2jmobius.loginserver.LoginController; public class Config { @@ -61,48 +57,43 @@ public class Config // interface public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; // main - private static final String ACCESS_CONFIG_FILE = "./config/main/Access.ini"; - private static final String CHARACTER_CONFIG_FILE = "./config/main/Character.ini"; - private static final String CLANHALL_CONFIG_FILE = "./config/main/Clanhall.ini"; - public static final String CLASS_DAMAGE_CONFIG_FILE = "./config/main/ClassDamage.ini"; - private static final String CONQUERABLE_CLANHALL_CONFIG_FILE = "./config/main/ConquerableClanHalls.ini"; - private static final String CRAFTING_CONFIG_FILE = "./config/main/Crafting.ini"; - private static final String ENCHANT_CONFIG_FILE = "./config/main/Enchant.ini"; - public static final String FORTSIEGE_CONFIG_FILE = "./config/main/Fort.ini"; - private static final String GENERAL_CONFIG_FILE = "./config/main/General.ini"; - private static final String GEOENGINE_CONFIG_FILE = "./config/main/GeoEngine.ini"; - private static final String OLYMP_CONFIG_FILE = "./config/main/Olympiad.ini"; - private static final String PHYSICS_CONFIG_FILE = "./config/main/Physics.ini"; - private static final String PVP_CONFIG_FILE = "./config/main/PvP.ini"; - private static final String RAIDBOSS_CONFIG_FILE = "./config/main/RaidBoss.ini"; - private static final String RATES_CONFIG_FILE = "./config/main/Rates.ini"; - private static final String SERVER_CONFIG_FILE = "./config/main/Server.ini"; - private static final String SEVENSIGNS_CONFIG_FILE = "./config/main/SevenSigns.ini"; - public static final String SIEGE_CONFIG_FILE = "./config/main/Siege.ini"; - // protected - private static final String PROTECT_FLOOD_CONFIG_FILE = "./config/protected/FloodProtector.ini"; - private static final String PROTECT_OTHER_CONFIG_FILE = "./config/protected/Other.ini"; - public static final String TELNET_CONFIG_FILE = "./config/protected/Telnet.ini"; - // events - private static final String EVENT_PC_BANG_POINT_CONFIG_FILE = "./config/events/PcBang.ini"; + private static final String ACCESS_CONFIG_FILE = "./config/Access.ini"; + private static final String CHARACTER_CONFIG_FILE = "./config/Character.ini"; + private static final String CLANHALL_CONFIG_FILE = "./config/Clanhall.ini"; + private static final String CONQUERABLE_CLANHALL_CONFIG_FILE = "./config/ConquerableHallSiege.ini"; + private static final String CRAFTING_CONFIG_FILE = "./config/Crafting.ini"; + private static final String ENCHANT_CONFIG_FILE = "./config/Enchant.ini"; + public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; + private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; + private static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; + private static final String OLYMP_CONFIG_FILE = "./config/Olympiad.ini"; + private static final String PROTECT_FLOOD_CONFIG_FILE = "./config/FloodProtector.ini"; + private static final String PROTECT_OTHER_CONFIG_FILE = "./config/Other.ini"; + private static final String PVP_CONFIG_FILE = "./config/PvP.ini"; + private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SEVENSIGNS_CONFIG_FILE = "./config/SevenSigns.ini"; + public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; + public static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; // custom private static final String BANK_CONFIG_FILE = "./config/custom/Bank.ini"; private static final String CANCEL_SKILL_RESTORE_BUFFS_CONFIG_FILE = "./config/custom/CancelSkillRestoreBuffs.ini"; private static final String CHAMPION_CONFIG_FILE = "./config/custom/Champion.ini"; + public static final String CLASS_DAMAGE_CONFIG_FILE = "./config/custom/ClassDamage.ini"; private static final String CUSTOM_AUTO_POTIONS_CONFIG_FILE = "./config/custom/AutoPotions.ini"; private static final String CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE = "./config/custom/CustomMailManager.ini"; private static final String MERCHANT_ZERO_SELL_PRICE_CONFIG_FILE = "./config/custom/MerchantZeroSellPrice.ini"; private static final String CUSTOM_RANDOM_SPAWNS_CONFIG_FILE = "./config/custom/RandomSpawns.ini"; private static final String OFFLINE_CONFIG_FILE = "./config/custom/Offline.ini"; private static final String OTHER_CONFIG_FILE = "./config/custom/Other.ini"; + private static final String PC_BANG_POINT_CONFIG_FILE = "./config/custom/PcBang.ini"; + private static final String PHYSICS_BALANCE_CONFIG_FILE = "./config/custom/PhysicsBalance.ini"; private static final String SCHEME_BUFFER_CONFIG_FILE = "./config/custom/SchemeBuffer.ini"; private static final String EVENT_REBIRTH_CONFIG_FILE = "./config/custom/Rebirth.ini"; private static final String EVENT_WEDDING_CONFIG_FILE = "./config/custom/Wedding.ini"; // login private static final String LOGIN_CONFIG_FILE = "./config/LoginServer.ini"; - // others - private static final String BANNED_IP_FILE = "./config/others/banned_ip.cfg"; - public static final String SERVER_NAME_FILE = "./config/others/servername.xml"; // -------------------------------------------------- // Variable Definitions @@ -1684,7 +1675,7 @@ public class Config public static void loadPCBPointConfig() { - final PropertiesParser pcBangConfig = new PropertiesParser(EVENT_PC_BANG_POINT_CONFIG_FILE); + final PropertiesParser pcBangConfig = new PropertiesParser(PC_BANG_POINT_CONFIG_FILE); PCB_ENABLE = pcBangConfig.getBoolean("PcBangPointEnable", true); PCB_MIN_LEVEL = pcBangConfig.getInt("PcBangPointMinLevel", 20); PCB_POINT_MIN = pcBangConfig.getInt("PcBangPointMinCount", 20); @@ -2261,7 +2252,7 @@ public class Config public static void loadPhysicsConfig() { - final PropertiesParser physicsSetting = new PropertiesParser(PHYSICS_CONFIG_FILE); + final PropertiesParser physicsSetting = new PropertiesParser(PHYSICS_BALANCE_CONFIG_FILE); ENABLE_CLASS_DAMAGE_SETTINGS = physicsSetting.getBoolean("EnableClassDamageSettings", true); ENABLE_CLASS_DAMAGE_SETTINGS_IN_OLY = physicsSetting.getBoolean("EnableClassDamageSettingsInOly", true); ENABLE_CLASS_DAMAGE_LOGGER = physicsSetting.getBoolean("EnableClassDamageLogger", false); @@ -2355,7 +2346,7 @@ public class Config public static void loadBossConfig() { - final PropertiesParser bossConfig = new PropertiesParser(RAIDBOSS_CONFIG_FILE); + final PropertiesParser bossConfig = new PropertiesParser(GRANDBOSS_CONFIG_FILE); ALT_RAIDS_STATS_BONUS = bossConfig.getBoolean("AltRaidsStatsBonus", true); RBLOCKRAGE = bossConfig.getInt("RBlockRage", 5000); if ((RBLOCKRAGE > 0) && (RBLOCKRAGE < 100)) @@ -2767,92 +2758,6 @@ public class Config MAX_LOGINSESSIONS = serverSettings.getInt("MaxSessions", 200); } - public static void loadBanFile() - { - File file = new File(BANNED_IP_FILE); - if (file.exists() && file.isFile()) - { - FileInputStream fis = null; - try - { - fis = new FileInputStream(file); - LineNumberReader reader = null; - String line; - String[] parts; - try - { - reader = new LineNumberReader(new InputStreamReader(fis)); - while ((line = reader.readLine()) != null) - { - line = line.trim(); - // check if this line isnt a comment line - if ((line.length() > 0) && (line.charAt(0) != '#')) - { - // split comments if any - parts = line.split("#", 2); - - // discard comments in the line, if any - line = parts[0]; - parts = line.split(" "); - - final String address = parts[0]; - long duration = 0; - if (parts.length > 1) - { - try - { - duration = Long.parseLong(parts[1]); - } - catch (NumberFormatException e) - { - LOGGER.warning("Skipped: Incorrect ban duration (" + parts[1] + ") on (" + file.getName() + "). Line: " + reader.getLineNumber()); - continue; - } - } - - try - { - LoginController.getInstance().addBanForAddress(address, duration); - } - catch (Exception e) - { - LOGGER.warning("Skipped: Invalid address (" + parts[0] + ") on (" + file.getName() + "). Line: " + reader.getLineNumber()); - } - } - } - } - catch (IOException e) - { - LOGGER.warning("Error while reading the bans file (" + file.getName() + "). Details: " + e); - } - - LOGGER.info("Loaded " + LoginController.getInstance().getBannedIps().size() + " IP Bans."); - } - catch (FileNotFoundException e) - { - LOGGER.warning("Failed to load banned IPs file (" + file.getName() + ") for reading. Reason: " + e); - } - finally - { - if (fis != null) - { - try - { - fis.close(); - } - catch (IOException e) - { - e.printStackTrace(); - } - } - } - } - else - { - LOGGER.info("IP Bans file (" + file.getName() + ") is missing or is a directory, skipped."); - } - } - public static void saveHexid(int serverId, String string) { saveHexid(serverId, string, HEXID_FILE); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java index e29bbcdb6d..558d64dfe3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java @@ -61,7 +61,7 @@ public class ScriptEngineManager implements IXmlReader public void load() { _exclusions.clear(); - parseDatapackFile("config/protected/Scripts.xml"); + parseDatapackFile("config/Scripts.xml"); LOGGER.info("Loaded " + _exclusions.size() + " files to exclude."); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java index 0010f9fa03..9e591f9c10 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java @@ -40,7 +40,7 @@ public class JavaScriptingEngine { // Load config. final Properties props = new Properties(); - try (FileInputStream fis = new FileInputStream("config/protected/ScriptEngine.ini")) + try (FileInputStream fis = new FileInputStream("config/ScriptEngine.ini")) { props.load(fis); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/GameServerTable.java index 55d0a5cb43..fa231296b2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/GameServerTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/GameServerTable.java @@ -46,7 +46,6 @@ import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import org.l2jmobius.Config; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.loginserver.network.LoginClient; @@ -141,7 +140,7 @@ public class GameServerTable { final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); final DocumentBuilder db = dbf.newDocumentBuilder(); - final Document doc = db.parse(new File(Config.SERVER_NAME_FILE)); + final Document doc = db.parse(new File("./data/servername.xml")); final Node n = doc.getFirstChild(); for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginServer.java index c9266edc1d..ccbc1de10d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginServer.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/LoginServer.java @@ -184,9 +184,9 @@ public class LoginServer extends FloodProtectedListener } } - private void loadBanFile() + public void loadBanFile() { - final File bannedFile = new File("./config/others/banned_ip.cfg"); + final File bannedFile = new File("./banned_ip.cfg"); if (bannedFile.exists() && bannedFile.isFile()) { String line; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/ui/Gui.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/ui/Gui.java index 1a7c8a0f0f..3ede5b3777 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/ui/Gui.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/ui/Gui.java @@ -130,7 +130,7 @@ public class Gui mntmBannedIps.addActionListener(arg0 -> { LoginController.getInstance().getBannedIps().clear(); - Config.loadBanFile(); + LoginServer.getInstance().loadBanFile(); }); mnReload.add(mntmBannedIps); diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/Access.ini b/L2J_Mobius_C6_Interlude/dist/game/config/Access.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/main/Access.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/Access.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/Character.ini b/L2J_Mobius_C6_Interlude/dist/game/config/Character.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/main/Character.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/Character.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/Clanhall.ini b/L2J_Mobius_C6_Interlude/dist/game/config/Clanhall.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/main/Clanhall.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/Clanhall.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/ConquerableClanHalls.ini b/L2J_Mobius_C6_Interlude/dist/game/config/ConquerableHallSiege.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/main/ConquerableClanHalls.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/ConquerableHallSiege.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/Crafting.ini b/L2J_Mobius_C6_Interlude/dist/game/config/Crafting.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/main/Crafting.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/Crafting.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/Enchant.ini b/L2J_Mobius_C6_Interlude/dist/game/config/Enchant.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/main/Enchant.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/Enchant.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/protected/FloodProtector.ini b/L2J_Mobius_C6_Interlude/dist/game/config/FloodProtector.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/protected/FloodProtector.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/FloodProtector.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/Fort.ini b/L2J_Mobius_C6_Interlude/dist/game/config/FortSiege.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/main/Fort.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/FortSiege.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/General.ini b/L2J_Mobius_C6_Interlude/dist/game/config/General.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/main/General.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/General.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/GeoEngine.ini b/L2J_Mobius_C6_Interlude/dist/game/config/GeoEngine.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/main/GeoEngine.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/GeoEngine.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/RaidBoss.ini b/L2J_Mobius_C6_Interlude/dist/game/config/GrandBoss.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/main/RaidBoss.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/GrandBoss.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/Olympiad.ini b/L2J_Mobius_C6_Interlude/dist/game/config/Olympiad.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/main/Olympiad.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/Olympiad.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/protected/Other.ini b/L2J_Mobius_C6_Interlude/dist/game/config/Other.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/protected/Other.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/Other.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/PvP.ini b/L2J_Mobius_C6_Interlude/dist/game/config/PvP.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/main/PvP.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/PvP.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/Rates.ini b/L2J_Mobius_C6_Interlude/dist/game/config/Rates.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/main/Rates.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/Rates.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/protected/ScriptEngine.ini b/L2J_Mobius_C6_Interlude/dist/game/config/ScriptEngine.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/protected/ScriptEngine.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/ScriptEngine.ini diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/protected/Scripts.xml b/L2J_Mobius_C6_Interlude/dist/game/config/Scripts.xml similarity index 92% rename from L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/protected/Scripts.xml rename to L2J_Mobius_C6_Interlude/dist/game/config/Scripts.xml index b04ede5547..45b1a08bc0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/config/protected/Scripts.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/config/Scripts.xml @@ -1,5 +1,5 @@ - + diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/Server.ini b/L2J_Mobius_C6_Interlude/dist/game/config/Server.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/main/Server.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/Server.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/SevenSigns.ini b/L2J_Mobius_C6_Interlude/dist/game/config/SevenSigns.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/main/SevenSigns.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/SevenSigns.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/Siege.ini b/L2J_Mobius_C6_Interlude/dist/game/config/Siege.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/main/Siege.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/Siege.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/protected/Telnet.ini b/L2J_Mobius_C6_Interlude/dist/game/config/Telnet.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/protected/Telnet.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/Telnet.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/ClassDamage.ini b/L2J_Mobius_C6_Interlude/dist/game/config/custom/ClassDamage.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/main/ClassDamage.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/custom/ClassDamage.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/events/PcBang.ini b/L2J_Mobius_C6_Interlude/dist/game/config/custom/PcBang.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/events/PcBang.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/custom/PcBang.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/Physics.ini b/L2J_Mobius_C6_Interlude/dist/game/config/custom/PhysicsBalance.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/game/config/main/Physics.ini rename to L2J_Mobius_C6_Interlude/dist/game/config/custom/PhysicsBalance.ini diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/others/banned_ip.cfg b/L2J_Mobius_C6_Interlude/dist/game/config/others/banned_ip.cfg deleted file mode 100644 index ee951522b4..0000000000 --- a/L2J_Mobius_C6_Interlude/dist/game/config/others/banned_ip.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# Subnets can be defined like 123.45.0.0 -# Comments after # are ignored -# Expiration timestamp can be added after IP for when to disable the ban -# Example: -# 192.168.0.0 1237618800000 # Bans all address starting with 192.168 and will expire on 21 Mar 2009 07:00:00 GMT -10.255.255.255 -10.254.254.254 diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/others/servername.xml b/L2J_Mobius_C6_Interlude/dist/game/config/others/servername.xml deleted file mode 100644 index 2006704401..0000000000 --- a/L2J_Mobius_C6_Interlude/dist/game/config/others/servername.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/others/servername.xsd b/L2J_Mobius_C6_Interlude/dist/game/config/others/servername.xsd deleted file mode 100644 index 1a1ca24033..0000000000 --- a/L2J_Mobius_C6_Interlude/dist/game/config/others/servername.xsd +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/login/config/protected/Telnet.ini b/L2J_Mobius_C6_Interlude/dist/login/config/Telnet.ini similarity index 100% rename from L2J_Mobius_C6_Interlude/dist/login/config/protected/Telnet.ini rename to L2J_Mobius_C6_Interlude/dist/login/config/Telnet.ini diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java index 14d02e5deb..31af53a193 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java @@ -72,40 +72,38 @@ public class Config // interface public static final String INTERFACE_CONFIG_FILE = "./config/Interface.ini"; // main - private static final String ACCESS_CONFIG_FILE = "./config/main/Access.ini"; - private static final String CHARACTER_CONFIG_FILE = "./config/main/Character.ini"; - private static final String CLANHALL_CONFIG_FILE = "./config/main/Clanhall.ini"; - public static final String CLASS_DAMAGE_CONFIG_FILE = "./config/main/ClassDamage.ini"; - private static final String CONQUERABLE_CLANHALL_CONFIG_FILE = "./config/main/ConquerableClanHalls.ini"; - private static final String CRAFTING_CONFIG_FILE = "./config/main/Crafting.ini"; - private static final String ENCHANT_CONFIG_FILE = "./config/main/Enchant.ini"; - public static final String FORTSIEGE_CONFIG_FILE = "./config/main/Fort.ini"; - private static final String GENERAL_CONFIG_FILE = "./config/main/General.ini"; - private static final String GEOENGINE_CONFIG_FILE = "./config/main/GeoEngine.ini"; - private static final String OLYMP_CONFIG_FILE = "./config/main/Olympiad.ini"; - private static final String PHYSICS_CONFIG_FILE = "./config/main/Physics.ini"; - private static final String PVP_CONFIG_FILE = "./config/main/PvP.ini"; - private static final String RAIDBOSS_CONFIG_FILE = "./config/main/RaidBoss.ini"; - private static final String RATES_CONFIG_FILE = "./config/main/Rates.ini"; - private static final String SERVER_CONFIG_FILE = "./config/main/Server.ini"; - private static final String SEVENSIGNS_CONFIG_FILE = "./config/main/SevenSigns.ini"; - public static final String SIEGE_CONFIG_FILE = "./config/main/Siege.ini"; - // protected - private static final String PROTECT_FLOOD_CONFIG_FILE = "./config/protected/FloodProtector.ini"; - private static final String PROTECT_OTHER_CONFIG_FILE = "./config/protected/Other.ini"; - public static final String TELNET_CONFIG_FILE = "./config/protected/Telnet.ini"; - // events - private static final String EVENT_PC_BANG_POINT_CONFIG_FILE = "./config/events/PcBang.ini"; + private static final String ACCESS_CONFIG_FILE = "./config/Access.ini"; + private static final String CHARACTER_CONFIG_FILE = "./config/Character.ini"; + private static final String CLANHALL_CONFIG_FILE = "./config/Clanhall.ini"; + private static final String CONQUERABLE_CLANHALL_CONFIG_FILE = "./config/ConquerableHallSiege.ini"; + private static final String CRAFTING_CONFIG_FILE = "./config/Crafting.ini"; + private static final String ENCHANT_CONFIG_FILE = "./config/Enchant.ini"; + public static final String FORTSIEGE_CONFIG_FILE = "./config/FortSiege.ini"; + private static final String GENERAL_CONFIG_FILE = "./config/General.ini"; + private static final String GEOENGINE_CONFIG_FILE = "./config/GeoEngine.ini"; + private static final String GRANDBOSS_CONFIG_FILE = "./config/GrandBoss.ini"; + private static final String OLYMP_CONFIG_FILE = "./config/Olympiad.ini"; + private static final String PROTECT_FLOOD_CONFIG_FILE = "./config/FloodProtector.ini"; + private static final String PROTECT_OTHER_CONFIG_FILE = "./config/Other.ini"; + private static final String PVP_CONFIG_FILE = "./config/PvP.ini"; + private static final String RATES_CONFIG_FILE = "./config/Rates.ini"; + private static final String SERVER_CONFIG_FILE = "./config/Server.ini"; + private static final String SEVENSIGNS_CONFIG_FILE = "./config/SevenSigns.ini"; + public static final String SIEGE_CONFIG_FILE = "./config/Siege.ini"; + public static final String TELNET_CONFIG_FILE = "./config/Telnet.ini"; // custom private static final String BANK_CONFIG_FILE = "./config/custom/Bank.ini"; private static final String CANCEL_SKILL_RESTORE_BUFFS_CONFIG_FILE = "./config/custom/CancelSkillRestoreBuffs.ini"; private static final String CHAMPION_CONFIG_FILE = "./config/custom/Champion.ini"; + public static final String CLASS_DAMAGE_CONFIG_FILE = "./config/custom/ClassDamage.ini"; private static final String CUSTOM_AUTO_POTIONS_CONFIG_FILE = "./config/custom/AutoPotions.ini"; private static final String CUSTOM_CUSTOM_MAIL_MANAGER_CONFIG_FILE = "./config/custom/CustomMailManager.ini"; private static final String MERCHANT_ZERO_SELL_PRICE_CONFIG_FILE = "./config/custom/MerchantZeroSellPrice.ini"; private static final String CUSTOM_RANDOM_SPAWNS_CONFIG_FILE = "./config/custom/RandomSpawns.ini"; private static final String OFFLINE_CONFIG_FILE = "./config/custom/Offline.ini"; private static final String OTHER_CONFIG_FILE = "./config/custom/Other.ini"; + private static final String PC_BANG_POINT_CONFIG_FILE = "./config/custom/PcBang.ini"; + private static final String PHYSICS_BALANCE_CONFIG_FILE = "./config/custom/PhysicsBalance.ini"; private static final String SCHEME_BUFFER_CONFIG_FILE = "./config/custom/SchemeBuffer.ini"; private static final String EVENT_REBIRTH_CONFIG_FILE = "./config/custom/Rebirth.ini"; private static final String EVENT_WEDDING_CONFIG_FILE = "./config/custom/Wedding.ini"; @@ -1730,7 +1728,7 @@ public class Config public static void loadPCBPointConfig() { - final PropertiesParser pcBangConfig = new PropertiesParser(EVENT_PC_BANG_POINT_CONFIG_FILE); + final PropertiesParser pcBangConfig = new PropertiesParser(PC_BANG_POINT_CONFIG_FILE); PCB_ENABLE = pcBangConfig.getBoolean("PcBangPointEnable", true); PCB_MIN_LEVEL = pcBangConfig.getInt("PcBangPointMinLevel", 20); PCB_POINT_MIN = pcBangConfig.getInt("PcBangPointMinCount", 20); @@ -2320,7 +2318,7 @@ public class Config public static void loadPhysicsConfig() { - final PropertiesParser physicsSetting = new PropertiesParser(PHYSICS_CONFIG_FILE); + final PropertiesParser physicsSetting = new PropertiesParser(PHYSICS_BALANCE_CONFIG_FILE); ENABLE_CLASS_DAMAGE_SETTINGS = physicsSetting.getBoolean("EnableClassDamageSettings", true); ENABLE_CLASS_DAMAGE_SETTINGS_IN_OLY = physicsSetting.getBoolean("EnableClassDamageSettingsInOly", true); ENABLE_CLASS_DAMAGE_LOGGER = physicsSetting.getBoolean("EnableClassDamageLogger", false); @@ -2414,7 +2412,7 @@ public class Config public static void loadBossConfig() { - final PropertiesParser bossConfig = new PropertiesParser(RAIDBOSS_CONFIG_FILE); + final PropertiesParser bossConfig = new PropertiesParser(GRANDBOSS_CONFIG_FILE); ALT_RAIDS_STATS_BONUS = bossConfig.getBoolean("AltRaidsStatsBonus", true); RBLOCKRAGE = bossConfig.getInt("RBlockRage", 5000); if ((RBLOCKRAGE > 0) && (RBLOCKRAGE < 100)) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java index e29bbcdb6d..558d64dfe3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java @@ -61,7 +61,7 @@ public class ScriptEngineManager implements IXmlReader public void load() { _exclusions.clear(); - parseDatapackFile("config/protected/Scripts.xml"); + parseDatapackFile("config/Scripts.xml"); LOGGER.info("Loaded " + _exclusions.size() + " files to exclude."); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java index 0010f9fa03..9e591f9c10 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java @@ -40,7 +40,7 @@ public class JavaScriptingEngine { // Load config. final Properties props = new Properties(); - try (FileInputStream fis = new FileInputStream("config/protected/ScriptEngine.ini")) + try (FileInputStream fis = new FileInputStream("config/ScriptEngine.ini")) { props.load(fis); }