some minor fixes in config

L2_GameServer/java/config/General.properties

@@ -60,10 +60,10 @@ GMStartupDietMode = False
 GMAdminMenuStyle = modern
 
 # Item restrictions apply to GMs aswell? (True = restricted usage)
-GmItemRestriction = True
+GMItemRestriction = True
 
 # Skill restrictions apply to GMs aswell? (True = restricted usage)
-GmSkillRestriction = True
+GMSkillRestriction = True
 
 
 # ---------------------------------------------------------------------------

L2_GameServer/java/config/fortsiege.properties

@@ -7,7 +7,7 @@
 # ---------------------------------------------------------------------------
 # Standard Settings
 # ---------------------------------------------------------------------------
-# Length of siege before the count down (in minutes)
+# Length of siege before the count down (in minutes).
 SiegeLength = 60
 
 # This defines how long you need to wait until the suspicious merchant will spawn after siege ends (in minutes).
@@ -15,7 +15,7 @@ SiegeLength = 60
 # Default: 180
 SuspiciousMerchantRespawnDelay = 180
 
-# This defines how long you have to kill all commanders once you kill the first one.
+# This defines how long you have to kill all commanders once you kill the first one (in minutes).
 # After that time (if all commanders not killed) all commanders and doors get respawned.
 CountDownLength = 10
 
@@ -126,13 +126,13 @@ BayouFlag3 = 190052,40062,-3253,9819
 
 # White Sands Fortress
 # Commander syntax:  NameCommanderN = x,y,z,heading,npc_id
-White SandsCommander1 = 117216,205648,-3048,0,35921
-White SandsCommander2 = 118880,203568,-3304,5396,35915
-White SandsCommander3 = 118560,206560,-3304,48872,35918
+WhiteSandsCommander1 = 117216,205648,-3048,0,35921
+WhiteSandsCommander2 = 118880,203568,-3304,5396,35915
+WhiteSandsCommander3 = 118560,206560,-3304,48872,35918
 # Flag syntax:  NameFlagN = x,y,z,flag_id
-White SandsFlag1 = 118640,205151,-3176,9819
-White SandsFlag2 = 118690,205062,-3176,9819
-White SandsFlag3 = 118742,204968,-3176,9819
+WhiteSandsFlag1 = 118640,205151,-3176,9819
+WhiteSandsFlag2 = 118690,205062,-3176,9819
+WhiteSandsFlag3 = 118742,204968,-3176,9819
 
 # Borderland Fortress
 # Commander syntax:  NameCommanderN = x,y,z,heading,npc_id
@@ -179,14 +179,14 @@ FloranFlag3 = 5299,149870,-2732,9819
 
 # Cloud Mountain Fortress
 # Commander syntax:  NameCommanderN = x,y,z,heading,npc_id
-Cloud MountainCommander1 = -55248,90496,-2536,0,36102
-Cloud MountainCommander2 = -55791,91856,-2792,0,36096
-Cloud MountainCommander3 = -54168,92604,-2784,49196,36099
-Cloud MountainCommander4 = -50913,92259,-2776,41188,36104
+CloudMountainCommander1 = -55248,90496,-2536,0,36102
+CloudMountainCommander2 = -55791,91856,-2792,0,36096
+CloudMountainCommander3 = -54168,92604,-2784,49196,36099
+CloudMountainCommander4 = -50913,92259,-2776,41188,36104
 # Flag syntax:  NameFlagN = x,y,z,flag_id
-Cloud MountainFlag1 = -53354,91537,-2664,9819
-Cloud MountainFlag2 = -53237,91537,-2664,9819
-Cloud MountainFlag3 = -53112,91537,-2664,9819
+CloudMountainFlag1 = -53354,91537,-2664,9819
+CloudMountainFlag2 = -53237,91537,-2664,9819
+CloudMountainFlag3 = -53112,91537,-2664,9819
 
 # Tanor Fortress
 # Commander syntax:  NameCommanderN = x,y,z,heading,npc_id

L2_GameServer/java/config/siege.properties

@@ -12,10 +12,6 @@
 # Default: 120
 SiegeLength = 120
 
-# Count down length, best to use a multiple of 5 (in minutes).
-# Default: 10
-CountDownLength = 10
-
 # Maximum number of flags per clan.
 # Default: 1
 MaxFlags = 1
@@ -59,7 +55,6 @@ GludioControlTower1=-18134,109785,-2683,13002,8000
 GludioControlTower2=-18137,108583,-2379,13002,20000
 GludioControlTower3=-18061,107294,-2409,13002,8000
 GludioControlTower4=-18359,112879,-2409,13002,8000
-# Artefacts syntax:  NameArtefactN=x,y,z,heading,npc_id
 GludioArtefact1=-18120,107984,-2483,16384,35063
 
 # Giran (see Gludio for details)

L2_GameServer/java/net/sf/l2j/Config.java

@@ -800,9 +800,6 @@ public final class Config
 	public static boolean ACCEPT_NEW_GAMESERVER;
 	public static int SERVER_ID;
 	public static byte[] HEX_ID;
-	public static int MINIMUM_UPDATE_DISTANCE;
-	public static int KNOWNLIST_FORGET_DELAY;
-	public static int MINIMUN_UPDATE_TIME;
 	public static boolean AUTO_CREATE_ACCOUNTS;
 	public static boolean FLOOD_PROTECTION;
 	public static int FAST_CONNECTION_LIMIT;
@@ -1377,8 +1374,8 @@ public final class Config
 					GM_STARTUP_AUTO_LIST = Boolean.parseBoolean(General.getProperty("GMStartupAutoList", "False"));
 					GM_STARTUP_DIET_MODE = Boolean.parseBoolean(General.getProperty("GMStartupDietMode", "False"));
 					GM_ADMIN_MENU_STYLE = General.getProperty("GMAdminMenuStyle", "modern");
-					GM_ITEM_RESTRICTION = Boolean.parseBoolean(General.getProperty("GmItemRestriction", "True"));
-					GM_SKILL_RESTRICTION = Boolean.parseBoolean(General.getProperty("GmSkillRestriction", "True"));
+					GM_ITEM_RESTRICTION = Boolean.parseBoolean(General.getProperty("GMItemRestriction", "True"));
+					GM_SKILL_RESTRICTION = Boolean.parseBoolean(General.getProperty("GMSkillRestriction", "True"));
 					BYPASS_VALIDATION = Boolean.parseBoolean(General.getProperty("BypassValidation", "True"));
 					GAMEGUARD_ENFORCE = Boolean.parseBoolean(General.getProperty("GameGuardEnforce", "True"));
 					GAMEGUARD_PROHIBITACTION = Boolean.parseBoolean(General.getProperty("GameGuardProhibitAction", "True"));
@@ -1461,7 +1458,6 @@ public final class Config
 					ALLOW_MANOR = Boolean.parseBoolean(General.getProperty("AllowManor", "True"));
 					ALLOW_BOAT = Boolean.parseBoolean(General.getProperty("AllowBoat", "True"));
 					ALLOW_CURSED_WEAPONS = Boolean.parseBoolean(General.getProperty("AllowCursedWeapons", "True"));
-					ALLOW_MANOR = Boolean.parseBoolean(General.getProperty("AllowManor", "True"));
 					ALLOW_NPC_WALKERS = Boolean.parseBoolean(General.getProperty("AllowNpcWalkers", "true"));
 					ALLOW_PET_WALKERS = Boolean.parseBoolean(General.getProperty("AllowPetWalkers", "True"));
 					SERVER_NEWS = Boolean.parseBoolean(General.getProperty("ShowServerNews", "False"));
@@ -2143,10 +2139,7 @@ public final class Config
 
 		else if (pName.equalsIgnoreCase("ZoneTown")) ZONE_TOWN = Integer.parseInt(pValue);
 
-		else if (pName.equalsIgnoreCase("MaximumUpdateDistance")) MINIMUM_UPDATE_DISTANCE = Integer.parseInt(pValue);
-		else if (pName.equalsIgnoreCase("MinimumUpdateTime")) MINIMUN_UPDATE_TIME = Integer.parseInt(pValue);
 		else if (pName.equalsIgnoreCase("CheckKnownList")) CHECK_KNOWN = Boolean.parseBoolean(pValue);
-		else if (pName.equalsIgnoreCase("KnownListForgetDelay")) KNOWNLIST_FORGET_DELAY = Integer.parseInt(pValue);
 
 		else if (pName.equalsIgnoreCase("UseDeepBlueDropRules")) DEEPBLUE_DROP_RULES = Boolean.parseBoolean(pValue);
 		else if (pName.equalsIgnoreCase("AllowGuards")) GUARD_ATTACK_AGGRO_MOB = Boolean.parseBoolean(pValue);
@@ -2386,6 +2379,7 @@ public final class Config
 		loadFloodProtectorConfig(properties, FLOOD_PROTECTOR_SUBCLASS, "Subclass", "20");
 		loadFloodProtectorConfig(properties, FLOOD_PROTECTOR_DROP_ITEM, "DropItem", "10");
 		loadFloodProtectorConfig(properties, FLOOD_PROTECTOR_SERVER_BYPASS, "ServerBypass", "5");
+		loadFloodProtectorConfig(properties, FLOOD_PROTECTOR_MULTISELL, "MultiSell", "1");
 	}
 	
 	/**