Browse Source

wrong placed config load, thanks Raikkon35

BiggBoss 13 years ago
parent
commit
5dba0b37ad
1 changed files with 17 additions and 17 deletions
  1. 17 17
      L2J_Server_BETA/java/com/l2jserver/Config.java

+ 17 - 17
L2J_Server_BETA/java/com/l2jserver/Config.java

@@ -2881,6 +2881,23 @@ public final class Config
 					e.printStackTrace();
 					throw new Error("Failed to Load " + SECURITY_CONFIG_FILE + " File.");
 				}
+				try
+				{
+					L2Properties chSiege = new L2Properties();
+					is = new FileInputStream(new File(CH_SIEGE_FILE));
+					chSiege.load(is);
+					
+					CHS_MAX_ATTACKERS = Integer.parseInt(chSiege.getProperty("MaxAttackers", "500"));
+					CHS_CLAN_MINLEVEL = Integer.parseInt(chSiege.getProperty("MinClanLevel", "4"));
+					CHS_MAX_FLAGS_PER_CLAN = Integer.parseInt(chSiege.getProperty("MaxFlagsPerClan", "1"));
+					CHS_ENABLE_FAME = Boolean.parseBoolean(chSiege.getProperty("EnableFame", "false"));
+					CHS_FAME_AMOUNT = Integer.parseInt(chSiege.getProperty("FameAmount", "0"));
+					CHS_FAME_FREQUENCY = Integer.parseInt(chSiege.getProperty("FameFrequency", "0"));
+				}
+				catch(Exception e)
+				{
+					e.printStackTrace();
+				}
 			}
 			finally
 			{
@@ -3006,23 +3023,6 @@ public final class Config
 					e.printStackTrace();
 					throw new Error("Failed to Load " + EMAIL_CONFIG_FILE + " File.");
 				}
-				try
-				{
-					L2Properties chSiege = new L2Properties();
-					is = new FileInputStream(new File(CH_SIEGE_FILE));
-					chSiege.load(is);
-					
-					CHS_MAX_ATTACKERS = Integer.parseInt(chSiege.getProperty("MaxAttackers", "500"));
-					CHS_CLAN_MINLEVEL = Integer.parseInt(chSiege.getProperty("MinClanLevel", "4"));
-					CHS_MAX_FLAGS_PER_CLAN = Integer.parseInt(chSiege.getProperty("MaxFlagsPerClan", "1"));
-					CHS_ENABLE_FAME = Boolean.parseBoolean(chSiege.getProperty("EnableFame", "false"));
-					CHS_FAME_AMOUNT = Integer.parseInt(chSiege.getProperty("FameAmount", "0"));
-					CHS_FAME_FREQUENCY = Integer.parseInt(chSiege.getProperty("FameFrequency", "0"));
-				}
-				catch(Exception e)
-				{
-					e.printStackTrace();
-				}
 			}
 			finally
 			{