Addition of KickMissingHWID configuration.

L2J_Mobius_1.0_Ertheia/dist/game/config/Server.ini

@@ -162,11 +162,15 @@ RestartOnDeadlock = False
 # ---------------------------------------------------------------------------
 
 # Check if hardware information is sent upon login.
-# Players without hardware information are kicked from the game.
 # WARNING: To receive hardware information from client, l2.ini NetSendHardWare must be set to true.
 # Default: False
 EnableHardwareInfo = False
 
+# Players without hardware information are kicked from the game.
+# Automatically set to True when MaxPlayersPerHWID > 0.
+# Default: False
+KickMissingHWID = False
+
 # Maximum number of players per HWID allowed to enter game.
 # Default: 0 (unlimited)
 MaxPlayersPerHWID = 0

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/Config.java

@@ -752,6 +752,7 @@ public class Config
 	public static int BACKUP_DAYS;
 	public static int MAXIMUM_ONLINE_USERS;
 	public static boolean HARDWARE_INFO_ENABLED;
+	public static boolean KICK_MISSING_HWID;
 	public static int MAX_PLAYERS_PER_HWID;
 	public static Pattern CHARNAME_TEMPLATE_PATTERN;
 	public static String PET_NAME_TEMPLATE;
@@ -1396,7 +1397,12 @@ public class Config
 			MAX_CHARACTERS_NUMBER_PER_ACCOUNT = serverSettings.getInt("CharMaxNumber", 7);
 			MAXIMUM_ONLINE_USERS = serverSettings.getInt("MaximumOnlineUsers", 100);
 			HARDWARE_INFO_ENABLED = serverSettings.getBoolean("EnableHardwareInfo", false);
+			KICK_MISSING_HWID = serverSettings.getBoolean("KickMissingHWID", false);
 			MAX_PLAYERS_PER_HWID = serverSettings.getInt("MaxPlayersPerHWID", 0);
+			if (MAX_PLAYERS_PER_HWID > 0)
+			{
+				KICK_MISSING_HWID = true;
+			}
 			final String[] protocols = serverSettings.getString("AllowedProtocolRevisions", "603;606;607").split(";");
 			PROTOCOL_LIST = new ArrayList<>(protocols.length);
 			for (String protocol : protocols)

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java

@@ -680,13 +680,11 @@ public class EnterWorld implements IClientIncomingPacket
 				}
 				
 				// Check max players.
-				if (Config.MAX_PLAYERS_PER_HWID > 0)
+				if (Config.KICK_MISSING_HWID && (hwInfo == null))
-				{
-					if (hwInfo == null)
 				{
 					Disconnection.of(client).defaultSequence(false);
 				}
-					else
+				else if (Config.MAX_PLAYERS_PER_HWID > 0)
 				{
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
@@ -701,7 +699,6 @@ public class EnterWorld implements IClientIncomingPacket
 						Disconnection.of(client).defaultSequence(false);
 					}
 				}
-				}
 			}, 5000);
 		}
 	}

L2J_Mobius_2.5_Underground/dist/game/config/Server.ini

@@ -162,11 +162,15 @@ RestartOnDeadlock = False
 # ---------------------------------------------------------------------------
 
 # Check if hardware information is sent upon login.
-# Players without hardware information are kicked from the game.
 # WARNING: To receive hardware information from client, l2.ini NetSendHardWare must be set to true.
 # Default: False
 EnableHardwareInfo = False
 
+# Players without hardware information are kicked from the game.
+# Automatically set to True when MaxPlayersPerHWID > 0.
+# Default: False
+KickMissingHWID = False
+
 # Maximum number of players per HWID allowed to enter game.
 # Default: 0 (unlimited)
 MaxPlayersPerHWID = 0

L2J_Mobius_2.5_Underground/java/org/l2jmobius/Config.java

@@ -761,6 +761,7 @@ public class Config
 	public static int BACKUP_DAYS;
 	public static int MAXIMUM_ONLINE_USERS;
 	public static boolean HARDWARE_INFO_ENABLED;
+	public static boolean KICK_MISSING_HWID;
 	public static int MAX_PLAYERS_PER_HWID;
 	public static Pattern CHARNAME_TEMPLATE_PATTERN;
 	public static String PET_NAME_TEMPLATE;
@@ -1406,7 +1407,12 @@ public class Config
 			MAX_CHARACTERS_NUMBER_PER_ACCOUNT = serverSettings.getInt("CharMaxNumber", 7);
 			MAXIMUM_ONLINE_USERS = serverSettings.getInt("MaximumOnlineUsers", 100);
 			HARDWARE_INFO_ENABLED = serverSettings.getBoolean("EnableHardwareInfo", false);
+			KICK_MISSING_HWID = serverSettings.getBoolean("KickMissingHWID", false);
 			MAX_PLAYERS_PER_HWID = serverSettings.getInt("MaxPlayersPerHWID", 0);
+			if (MAX_PLAYERS_PER_HWID > 0)
+			{
+				KICK_MISSING_HWID = true;
+			}
 			final String[] protocols = serverSettings.getString("AllowedProtocolRevisions", "603;606;607").split(";");
 			PROTOCOL_LIST = new ArrayList<>(protocols.length);
 			for (String protocol : protocols)

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java

@@ -713,13 +713,11 @@ public class EnterWorld implements IClientIncomingPacket
 				}
 				
 				// Check max players.
-				if (Config.MAX_PLAYERS_PER_HWID > 0)
+				if (Config.KICK_MISSING_HWID && (hwInfo == null))
-				{
-					if (hwInfo == null)
 				{
 					Disconnection.of(client).defaultSequence(false);
 				}
-					else
+				else if (Config.MAX_PLAYERS_PER_HWID > 0)
 				{
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
@@ -734,7 +732,6 @@ public class EnterWorld implements IClientIncomingPacket
 						Disconnection.of(client).defaultSequence(false);
 					}
 				}
-				}
 			}, 5000);
 		}
 	}

L2J_Mobius_3.0_Helios/dist/game/config/Server.ini

@@ -162,11 +162,15 @@ RestartOnDeadlock = False
 # ---------------------------------------------------------------------------
 
 # Check if hardware information is sent upon login.
-# Players without hardware information are kicked from the game.
 # WARNING: To receive hardware information from client, l2.ini NetSendHardWare must be set to true.
 # Default: False
 EnableHardwareInfo = False
 
+# Players without hardware information are kicked from the game.
+# Automatically set to True when MaxPlayersPerHWID > 0.
+# Default: False
+KickMissingHWID = False
+
 # Maximum number of players per HWID allowed to enter game.
 # Default: 0 (unlimited)
 MaxPlayersPerHWID = 0

L2J_Mobius_3.0_Helios/java/org/l2jmobius/Config.java

@@ -762,6 +762,7 @@ public class Config
 	public static int BACKUP_DAYS;
 	public static int MAXIMUM_ONLINE_USERS;
 	public static boolean HARDWARE_INFO_ENABLED;
+	public static boolean KICK_MISSING_HWID;
 	public static int MAX_PLAYERS_PER_HWID;
 	public static Pattern CHARNAME_TEMPLATE_PATTERN;
 	public static String PET_NAME_TEMPLATE;
@@ -1419,7 +1420,12 @@ public class Config
 			MAX_CHARACTERS_NUMBER_PER_ACCOUNT = serverSettings.getInt("CharMaxNumber", 7);
 			MAXIMUM_ONLINE_USERS = serverSettings.getInt("MaximumOnlineUsers", 100);
 			HARDWARE_INFO_ENABLED = serverSettings.getBoolean("EnableHardwareInfo", false);
+			KICK_MISSING_HWID = serverSettings.getBoolean("KickMissingHWID", false);
 			MAX_PLAYERS_PER_HWID = serverSettings.getInt("MaxPlayersPerHWID", 0);
+			if (MAX_PLAYERS_PER_HWID > 0)
+			{
+				KICK_MISSING_HWID = true;
+			}
 			final String[] protocols = serverSettings.getString("AllowedProtocolRevisions", "603;606;607").split(";");
 			PROTOCOL_LIST = new ArrayList<>(protocols.length);
 			for (String protocol : protocols)

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java

@@ -713,13 +713,11 @@ public class EnterWorld implements IClientIncomingPacket
 				}
 				
 				// Check max players.
-				if (Config.MAX_PLAYERS_PER_HWID > 0)
+				if (Config.KICK_MISSING_HWID && (hwInfo == null))
-				{
-					if (hwInfo == null)
 				{
 					Disconnection.of(client).defaultSequence(false);
 				}
-					else
+				else if (Config.MAX_PLAYERS_PER_HWID > 0)
 				{
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
@@ -734,7 +732,6 @@ public class EnterWorld implements IClientIncomingPacket
 						Disconnection.of(client).defaultSequence(false);
 					}
 				}
-				}
 			}, 5000);
 		}
 	}

L2J_Mobius_4.0_GrandCrusade/dist/game/config/Server.ini

@@ -162,11 +162,15 @@ RestartOnDeadlock = False
 # ---------------------------------------------------------------------------
 
 # Check if hardware information is sent upon login.
-# Players without hardware information are kicked from the game.
 # WARNING: To receive hardware information from client, l2.ini NetSendHardWare must be set to true.
 # Default: False
 EnableHardwareInfo = False
 
+# Players without hardware information are kicked from the game.
+# Automatically set to True when MaxPlayersPerHWID > 0.
+# Default: False
+KickMissingHWID = False
+
 # Maximum number of players per HWID allowed to enter game.
 # Default: 0 (unlimited)
 MaxPlayersPerHWID = 0

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/Config.java

@@ -749,6 +749,7 @@ public class Config
 	public static int BACKUP_DAYS;
 	public static int MAXIMUM_ONLINE_USERS;
 	public static boolean HARDWARE_INFO_ENABLED;
+	public static boolean KICK_MISSING_HWID;
 	public static int MAX_PLAYERS_PER_HWID;
 	public static Pattern CHARNAME_TEMPLATE_PATTERN;
 	public static String PET_NAME_TEMPLATE;
@@ -1406,7 +1407,12 @@ public class Config
 			MAX_CHARACTERS_NUMBER_PER_ACCOUNT = serverSettings.getInt("CharMaxNumber", 7);
 			MAXIMUM_ONLINE_USERS = serverSettings.getInt("MaximumOnlineUsers", 100);
 			HARDWARE_INFO_ENABLED = serverSettings.getBoolean("EnableHardwareInfo", false);
+			KICK_MISSING_HWID = serverSettings.getBoolean("KickMissingHWID", false);
 			MAX_PLAYERS_PER_HWID = serverSettings.getInt("MaxPlayersPerHWID", 0);
+			if (MAX_PLAYERS_PER_HWID > 0)
+			{
+				KICK_MISSING_HWID = true;
+			}
 			final String[] protocols = serverSettings.getString("AllowedProtocolRevisions", "603;606;607").split(";");
 			PROTOCOL_LIST = new ArrayList<>(protocols.length);
 			for (String protocol : protocols)

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java

@@ -713,13 +713,11 @@ public class EnterWorld implements IClientIncomingPacket
 				}
 				
 				// Check max players.
-				if (Config.MAX_PLAYERS_PER_HWID > 0)
+				if (Config.KICK_MISSING_HWID && (hwInfo == null))
-				{
-					if (hwInfo == null)
 				{
 					Disconnection.of(client).defaultSequence(false);
 				}
-					else
+				else if (Config.MAX_PLAYERS_PER_HWID > 0)
 				{
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
@@ -734,7 +732,6 @@ public class EnterWorld implements IClientIncomingPacket
 						Disconnection.of(client).defaultSequence(false);
 					}
 				}
-				}
 			}, 5000);
 		}
 	}

L2J_Mobius_5.0_Salvation/dist/game/config/Server.ini

@@ -162,11 +162,15 @@ RestartOnDeadlock = False
 # ---------------------------------------------------------------------------
 
 # Check if hardware information is sent upon login.
-# Players without hardware information are kicked from the game.
 # WARNING: To receive hardware information from client, l2.ini NetSendHardWare must be set to true.
 # Default: False
 EnableHardwareInfo = False
 
+# Players without hardware information are kicked from the game.
+# Automatically set to True when MaxPlayersPerHWID > 0.
+# Default: False
+KickMissingHWID = False
+
 # Maximum number of players per HWID allowed to enter game.
 # Default: 0 (unlimited)
 MaxPlayersPerHWID = 0

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/Config.java

@@ -744,6 +744,7 @@ public class Config
 	public static int BACKUP_DAYS;
 	public static int MAXIMUM_ONLINE_USERS;
 	public static boolean HARDWARE_INFO_ENABLED;
+	public static boolean KICK_MISSING_HWID;
 	public static int MAX_PLAYERS_PER_HWID;
 	public static Pattern CHARNAME_TEMPLATE_PATTERN;
 	public static String PET_NAME_TEMPLATE;
@@ -1401,7 +1402,12 @@ public class Config
 			MAX_CHARACTERS_NUMBER_PER_ACCOUNT = serverSettings.getInt("CharMaxNumber", 7);
 			MAXIMUM_ONLINE_USERS = serverSettings.getInt("MaximumOnlineUsers", 100);
 			HARDWARE_INFO_ENABLED = serverSettings.getBoolean("EnableHardwareInfo", false);
+			KICK_MISSING_HWID = serverSettings.getBoolean("KickMissingHWID", false);
 			MAX_PLAYERS_PER_HWID = serverSettings.getInt("MaxPlayersPerHWID", 0);
+			if (MAX_PLAYERS_PER_HWID > 0)
+			{
+				KICK_MISSING_HWID = true;
+			}
 			final String[] protocols = serverSettings.getString("AllowedProtocolRevisions", "603;606;607").split(";");
 			PROTOCOL_LIST = new ArrayList<>(protocols.length);
 			for (String protocol : protocols)

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java

@@ -711,13 +711,11 @@ public class EnterWorld implements IClientIncomingPacket
 				}
 				
 				// Check max players.
-				if (Config.MAX_PLAYERS_PER_HWID > 0)
+				if (Config.KICK_MISSING_HWID && (hwInfo == null))
-				{
-					if (hwInfo == null)
 				{
 					Disconnection.of(client).defaultSequence(false);
 				}
-					else
+				else if (Config.MAX_PLAYERS_PER_HWID > 0)
 				{
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
@@ -732,7 +730,6 @@ public class EnterWorld implements IClientIncomingPacket
 						Disconnection.of(client).defaultSequence(false);
 					}
 				}
-				}
 			}, 5000);
 		}
 	}

L2J_Mobius_5.5_EtinasFate/dist/game/config/Server.ini

@@ -162,11 +162,15 @@ RestartOnDeadlock = False
 # ---------------------------------------------------------------------------
 
 # Check if hardware information is sent upon login.
-# Players without hardware information are kicked from the game.
 # WARNING: To receive hardware information from client, l2.ini NetSendHardWare must be set to true.
 # Default: False
 EnableHardwareInfo = False
 
+# Players without hardware information are kicked from the game.
+# Automatically set to True when MaxPlayersPerHWID > 0.
+# Default: False
+KickMissingHWID = False
+
 # Maximum number of players per HWID allowed to enter game.
 # Default: 0 (unlimited)
 MaxPlayersPerHWID = 0

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/Config.java

@@ -744,6 +744,7 @@ public class Config
 	public static int BACKUP_DAYS;
 	public static int MAXIMUM_ONLINE_USERS;
 	public static boolean HARDWARE_INFO_ENABLED;
+	public static boolean KICK_MISSING_HWID;
 	public static int MAX_PLAYERS_PER_HWID;
 	public static Pattern CHARNAME_TEMPLATE_PATTERN;
 	public static String PET_NAME_TEMPLATE;
@@ -1408,7 +1409,12 @@ public class Config
 			MAX_CHARACTERS_NUMBER_PER_ACCOUNT = serverSettings.getInt("CharMaxNumber", 7);
 			MAXIMUM_ONLINE_USERS = serverSettings.getInt("MaximumOnlineUsers", 100);
 			HARDWARE_INFO_ENABLED = serverSettings.getBoolean("EnableHardwareInfo", false);
+			KICK_MISSING_HWID = serverSettings.getBoolean("KickMissingHWID", false);
 			MAX_PLAYERS_PER_HWID = serverSettings.getInt("MaxPlayersPerHWID", 0);
+			if (MAX_PLAYERS_PER_HWID > 0)
+			{
+				KICK_MISSING_HWID = true;
+			}
 			final String[] protocols = serverSettings.getString("AllowedProtocolRevisions", "603;606;607").split(";");
 			PROTOCOL_LIST = new ArrayList<>(protocols.length);
 			for (String protocol : protocols)

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java

@@ -711,13 +711,11 @@ public class EnterWorld implements IClientIncomingPacket
 				}
 				
 				// Check max players.
-				if (Config.MAX_PLAYERS_PER_HWID > 0)
+				if (Config.KICK_MISSING_HWID && (hwInfo == null))
-				{
-					if (hwInfo == null)
 				{
 					Disconnection.of(client).defaultSequence(false);
 				}
-					else
+				else if (Config.MAX_PLAYERS_PER_HWID > 0)
 				{
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
@@ -732,7 +730,6 @@ public class EnterWorld implements IClientIncomingPacket
 						Disconnection.of(client).defaultSequence(false);
 					}
 				}
-				}
 			}, 5000);
 		}
 	}

L2J_Mobius_6.0_Fafurion/dist/game/config/Server.ini

@@ -162,11 +162,15 @@ RestartOnDeadlock = False
 # ---------------------------------------------------------------------------
 
 # Check if hardware information is sent upon login.
-# Players without hardware information are kicked from the game.
 # WARNING: To receive hardware information from client, l2.ini NetSendHardWare must be set to true.
 # Default: False
 EnableHardwareInfo = False
 
+# Players without hardware information are kicked from the game.
+# Automatically set to True when MaxPlayersPerHWID > 0.
+# Default: False
+KickMissingHWID = False
+
 # Maximum number of players per HWID allowed to enter game.
 # Default: 0 (unlimited)
 MaxPlayersPerHWID = 0

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/Config.java

@@ -745,6 +745,7 @@ public class Config
 	public static int BACKUP_DAYS;
 	public static int MAXIMUM_ONLINE_USERS;
 	public static boolean HARDWARE_INFO_ENABLED;
+	public static boolean KICK_MISSING_HWID;
 	public static int MAX_PLAYERS_PER_HWID;
 	public static Pattern CHARNAME_TEMPLATE_PATTERN;
 	public static String PET_NAME_TEMPLATE;
@@ -1430,7 +1431,12 @@ public class Config
 			MAX_CHARACTERS_NUMBER_PER_ACCOUNT = serverSettings.getInt("CharMaxNumber", 7);
 			MAXIMUM_ONLINE_USERS = serverSettings.getInt("MaximumOnlineUsers", 100);
 			HARDWARE_INFO_ENABLED = serverSettings.getBoolean("EnableHardwareInfo", false);
+			KICK_MISSING_HWID = serverSettings.getBoolean("KickMissingHWID", false);
 			MAX_PLAYERS_PER_HWID = serverSettings.getInt("MaxPlayersPerHWID", 0);
+			if (MAX_PLAYERS_PER_HWID > 0)
+			{
+				KICK_MISSING_HWID = true;
+			}
 			final String[] protocols = serverSettings.getString("AllowedProtocolRevisions", "603;606;607").split(";");
 			PROTOCOL_LIST = new ArrayList<>(protocols.length);
 			for (String protocol : protocols)

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java

@@ -711,13 +711,11 @@ public class EnterWorld implements IClientIncomingPacket
 				}
 				
 				// Check max players.
-				if (Config.MAX_PLAYERS_PER_HWID > 0)
+				if (Config.KICK_MISSING_HWID && (hwInfo == null))
-				{
-					if (hwInfo == null)
 				{
 					Disconnection.of(client).defaultSequence(false);
 				}
-					else
+				else if (Config.MAX_PLAYERS_PER_HWID > 0)
 				{
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
@@ -732,7 +730,6 @@ public class EnterWorld implements IClientIncomingPacket
 						Disconnection.of(client).defaultSequence(false);
 					}
 				}
-				}
 			}, 5000);
 		}
 	}

L2J_Mobius_7.0_PreludeOfWar/dist/game/config/Server.ini

@@ -162,11 +162,15 @@ RestartOnDeadlock = False
 # ---------------------------------------------------------------------------
 
 # Check if hardware information is sent upon login.
-# Players without hardware information are kicked from the game.
 # WARNING: To receive hardware information from client, l2.ini NetSendHardWare must be set to true.
 # Default: False
 EnableHardwareInfo = False
 
+# Players without hardware information are kicked from the game.
+# Automatically set to True when MaxPlayersPerHWID > 0.
+# Default: False
+KickMissingHWID = False
+
 # Maximum number of players per HWID allowed to enter game.
 # Default: 0 (unlimited)
 MaxPlayersPerHWID = 0

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/Config.java

@@ -750,6 +750,7 @@ public class Config
 	public static int BACKUP_DAYS;
 	public static int MAXIMUM_ONLINE_USERS;
 	public static boolean HARDWARE_INFO_ENABLED;
+	public static boolean KICK_MISSING_HWID;
 	public static int MAX_PLAYERS_PER_HWID;
 	public static Pattern CHARNAME_TEMPLATE_PATTERN;
 	public static String PET_NAME_TEMPLATE;
@@ -1441,7 +1442,12 @@ public class Config
 			MAX_CHARACTERS_NUMBER_PER_ACCOUNT = serverSettings.getInt("CharMaxNumber", 7);
 			MAXIMUM_ONLINE_USERS = serverSettings.getInt("MaximumOnlineUsers", 100);
 			HARDWARE_INFO_ENABLED = serverSettings.getBoolean("EnableHardwareInfo", false);
+			KICK_MISSING_HWID = serverSettings.getBoolean("KickMissingHWID", false);
 			MAX_PLAYERS_PER_HWID = serverSettings.getInt("MaxPlayersPerHWID", 0);
+			if (MAX_PLAYERS_PER_HWID > 0)
+			{
+				KICK_MISSING_HWID = true;
+			}
 			final String[] protocols = serverSettings.getString("AllowedProtocolRevisions", "603;606;607").split(";");
 			PROTOCOL_LIST = new ArrayList<>(protocols.length);
 			for (String protocol : protocols)

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java

@@ -738,13 +738,11 @@ public class EnterWorld implements IClientIncomingPacket
 				}
 				
 				// Check max players.
-				if (Config.MAX_PLAYERS_PER_HWID > 0)
+				if (Config.KICK_MISSING_HWID && (hwInfo == null))
-				{
-					if (hwInfo == null)
 				{
 					Disconnection.of(client).defaultSequence(false);
 				}
-					else
+				else if (Config.MAX_PLAYERS_PER_HWID > 0)
 				{
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
@@ -759,7 +757,6 @@ public class EnterWorld implements IClientIncomingPacket
 						Disconnection.of(client).defaultSequence(false);
 					}
 				}
-				}
 			}, 5000);
 		}
 	}

L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Server.ini

@@ -162,11 +162,15 @@ RestartOnDeadlock = False
 # ---------------------------------------------------------------------------
 
 # Check if hardware information is sent upon login.
-# Players without hardware information are kicked from the game.
 # WARNING: To receive hardware information from client, l2.ini NetSendHardWare must be set to true.
 # Default: False
 EnableHardwareInfo = False
 
+# Players without hardware information are kicked from the game.
+# Automatically set to True when MaxPlayersPerHWID > 0.
+# Default: False
+KickMissingHWID = False
+
 # Maximum number of players per HWID allowed to enter game.
 # Default: 0 (unlimited)
 MaxPlayersPerHWID = 0

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java

@@ -751,6 +751,7 @@ public class Config
 	public static int BACKUP_DAYS;
 	public static int MAXIMUM_ONLINE_USERS;
 	public static boolean HARDWARE_INFO_ENABLED;
+	public static boolean KICK_MISSING_HWID;
 	public static int MAX_PLAYERS_PER_HWID;
 	public static Pattern CHARNAME_TEMPLATE_PATTERN;
 	public static String PET_NAME_TEMPLATE;
@@ -1337,7 +1338,12 @@ public class Config
 			MAX_CHARACTERS_NUMBER_PER_ACCOUNT = serverSettings.getInt("CharMaxNumber", 7);
 			MAXIMUM_ONLINE_USERS = serverSettings.getInt("MaximumOnlineUsers", 100);
 			HARDWARE_INFO_ENABLED = serverSettings.getBoolean("EnableHardwareInfo", false);
+			KICK_MISSING_HWID = serverSettings.getBoolean("KickMissingHWID", false);
 			MAX_PLAYERS_PER_HWID = serverSettings.getInt("MaxPlayersPerHWID", 0);
+			if (MAX_PLAYERS_PER_HWID > 0)
+			{
+				KICK_MISSING_HWID = true;
+			}
 			final String[] protocols = serverSettings.getString("AllowedProtocolRevisions", "603;606;607").split(";");
 			PROTOCOL_LIST = new ArrayList<>(protocols.length);
 			for (String protocol : protocols)

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java

@@ -696,13 +696,11 @@ public class EnterWorld implements IClientIncomingPacket
 				}
 				
 				// Check max players.
-				if (Config.MAX_PLAYERS_PER_HWID > 0)
+				if (Config.KICK_MISSING_HWID && (hwInfo == null))
-				{
-					if (hwInfo == null)
 				{
 					Disconnection.of(client).defaultSequence(false);
 				}
-					else
+				else if (Config.MAX_PLAYERS_PER_HWID > 0)
 				{
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
@@ -717,7 +715,6 @@ public class EnterWorld implements IClientIncomingPacket
 						Disconnection.of(client).defaultSequence(false);
 					}
 				}
-				}
 			}, 5000);
 		}
 	}

L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Server.ini

@@ -162,11 +162,15 @@ RestartOnDeadlock = False
 # ---------------------------------------------------------------------------
 
 # Check if hardware information is sent upon login.
-# Players without hardware information are kicked from the game.
 # WARNING: To receive hardware information from client, l2.ini NetSendHardWare must be set to true.
 # Default: False
 EnableHardwareInfo = False
 
+# Players without hardware information are kicked from the game.
+# Automatically set to True when MaxPlayersPerHWID > 0.
+# Default: False
+KickMissingHWID = False
+
 # Maximum number of players per HWID allowed to enter game.
 # Default: 0 (unlimited)
 MaxPlayersPerHWID = 0

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/Config.java

@@ -751,6 +751,7 @@ public class Config
 	public static int BACKUP_DAYS;
 	public static int MAXIMUM_ONLINE_USERS;
 	public static boolean HARDWARE_INFO_ENABLED;
+	public static boolean KICK_MISSING_HWID;
 	public static int MAX_PLAYERS_PER_HWID;
 	public static Pattern CHARNAME_TEMPLATE_PATTERN;
 	public static String PET_NAME_TEMPLATE;
@@ -1341,7 +1342,12 @@ public class Config
 			MAX_CHARACTERS_NUMBER_PER_ACCOUNT = serverSettings.getInt("CharMaxNumber", 7);
 			MAXIMUM_ONLINE_USERS = serverSettings.getInt("MaximumOnlineUsers", 100);
 			HARDWARE_INFO_ENABLED = serverSettings.getBoolean("EnableHardwareInfo", false);
+			KICK_MISSING_HWID = serverSettings.getBoolean("KickMissingHWID", false);
 			MAX_PLAYERS_PER_HWID = serverSettings.getInt("MaxPlayersPerHWID", 0);
+			if (MAX_PLAYERS_PER_HWID > 0)
+			{
+				KICK_MISSING_HWID = true;
+			}
 			final String[] protocols = serverSettings.getString("AllowedProtocolRevisions", "603;606;607").split(";");
 			PROTOCOL_LIST = new ArrayList<>(protocols.length);
 			for (String protocol : protocols)

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java

@@ -696,13 +696,11 @@ public class EnterWorld implements IClientIncomingPacket
 				}
 				
 				// Check max players.
-				if (Config.MAX_PLAYERS_PER_HWID > 0)
+				if (Config.KICK_MISSING_HWID && (hwInfo == null))
-				{
-					if (hwInfo == null)
 				{
 					Disconnection.of(client).defaultSequence(false);
 				}
-					else
+				else if (Config.MAX_PLAYERS_PER_HWID > 0)
 				{
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
@@ -717,7 +715,6 @@ public class EnterWorld implements IClientIncomingPacket
 						Disconnection.of(client).defaultSequence(false);
 					}
 				}
-				}
 			}, 5000);
 		}
 	}

L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Server.ini

@@ -162,11 +162,15 @@ RestartOnDeadlock = False
 # ---------------------------------------------------------------------------
 
 # Check if hardware information is sent upon login.
-# Players without hardware information are kicked from the game.
 # WARNING: To receive hardware information from client, l2.ini NetSendHardWare must be set to true.
 # Default: False
 EnableHardwareInfo = False
 
+# Players without hardware information are kicked from the game.
+# Automatically set to True when MaxPlayersPerHWID > 0.
+# Default: False
+KickMissingHWID = False
+
 # Maximum number of players per HWID allowed to enter game.
 # Default: 0 (unlimited)
 MaxPlayersPerHWID = 0

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/Config.java

@@ -751,6 +751,7 @@ public class Config
 	public static int BACKUP_DAYS;
 	public static int MAXIMUM_ONLINE_USERS;
 	public static boolean HARDWARE_INFO_ENABLED;
+	public static boolean KICK_MISSING_HWID;
 	public static int MAX_PLAYERS_PER_HWID;
 	public static Pattern CHARNAME_TEMPLATE_PATTERN;
 	public static String PET_NAME_TEMPLATE;
@@ -1341,7 +1342,12 @@ public class Config
 			MAX_CHARACTERS_NUMBER_PER_ACCOUNT = serverSettings.getInt("CharMaxNumber", 7);
 			MAXIMUM_ONLINE_USERS = serverSettings.getInt("MaximumOnlineUsers", 100);
 			HARDWARE_INFO_ENABLED = serverSettings.getBoolean("EnableHardwareInfo", false);
+			KICK_MISSING_HWID = serverSettings.getBoolean("KickMissingHWID", false);
 			MAX_PLAYERS_PER_HWID = serverSettings.getInt("MaxPlayersPerHWID", 0);
+			if (MAX_PLAYERS_PER_HWID > 0)
+			{
+				KICK_MISSING_HWID = true;
+			}
 			final String[] protocols = serverSettings.getString("AllowedProtocolRevisions", "603;606;607").split(";");
 			PROTOCOL_LIST = new ArrayList<>(protocols.length);
 			for (String protocol : protocols)

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java

@@ -698,13 +698,11 @@ public class EnterWorld implements IClientIncomingPacket
 				}
 				
 				// Check max players.
-				if (Config.MAX_PLAYERS_PER_HWID > 0)
+				if (Config.KICK_MISSING_HWID && (hwInfo == null))
-				{
-					if (hwInfo == null)
 				{
 					Disconnection.of(client).defaultSequence(false);
 				}
-					else
+				else if (Config.MAX_PLAYERS_PER_HWID > 0)
 				{
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
@@ -719,7 +717,6 @@ public class EnterWorld implements IClientIncomingPacket
 						Disconnection.of(client).defaultSequence(false);
 					}
 				}
-				}
 			}, 5000);
 		}
 	}

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Server.ini

@@ -162,11 +162,15 @@ RestartOnDeadlock = False
 # ---------------------------------------------------------------------------
 
 # Check if hardware information is sent upon login.
-# Players without hardware information are kicked from the game.
 # WARNING: To receive hardware information from client, l2.ini NetSendHardWare must be set to true.
 # Default: False
 EnableHardwareInfo = False
 
+# Players without hardware information are kicked from the game.
+# Automatically set to True when MaxPlayersPerHWID > 0.
+# Default: False
+KickMissingHWID = False
+
 # Maximum number of players per HWID allowed to enter game.
 # Default: 0 (unlimited)
 MaxPlayersPerHWID = 0

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/Config.java

@@ -751,6 +751,7 @@ public class Config
 	public static int BACKUP_DAYS;
 	public static int MAXIMUM_ONLINE_USERS;
 	public static boolean HARDWARE_INFO_ENABLED;
+	public static boolean KICK_MISSING_HWID;
 	public static int MAX_PLAYERS_PER_HWID;
 	public static Pattern CHARNAME_TEMPLATE_PATTERN;
 	public static String PET_NAME_TEMPLATE;
@@ -1341,7 +1342,12 @@ public class Config
 			MAX_CHARACTERS_NUMBER_PER_ACCOUNT = serverSettings.getInt("CharMaxNumber", 7);
 			MAXIMUM_ONLINE_USERS = serverSettings.getInt("MaximumOnlineUsers", 100);
 			HARDWARE_INFO_ENABLED = serverSettings.getBoolean("EnableHardwareInfo", false);
+			KICK_MISSING_HWID = serverSettings.getBoolean("KickMissingHWID", false);
 			MAX_PLAYERS_PER_HWID = serverSettings.getInt("MaxPlayersPerHWID", 0);
+			if (MAX_PLAYERS_PER_HWID > 0)
+			{
+				KICK_MISSING_HWID = true;
+			}
 			final String[] protocols = serverSettings.getString("AllowedProtocolRevisions", "603;606;607").split(";");
 			PROTOCOL_LIST = new ArrayList<>(protocols.length);
 			for (String protocol : protocols)

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java

@@ -698,13 +698,11 @@ public class EnterWorld implements IClientIncomingPacket
 				}
 				
 				// Check max players.
-				if (Config.MAX_PLAYERS_PER_HWID > 0)
+				if (Config.KICK_MISSING_HWID && (hwInfo == null))
-				{
-					if (hwInfo == null)
 				{
 					Disconnection.of(client).defaultSequence(false);
 				}
-					else
+				else if (Config.MAX_PLAYERS_PER_HWID > 0)
 				{
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
@@ -719,7 +717,6 @@ public class EnterWorld implements IClientIncomingPacket
 						Disconnection.of(client).defaultSequence(false);
 					}
 				}
-				}
 			}, 5000);
 		}
 	}

L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Server.ini

@@ -162,11 +162,15 @@ RestartOnDeadlock = False
 # ---------------------------------------------------------------------------
 
 # Check if hardware information is sent upon login.
-# Players without hardware information are kicked from the game.
 # WARNING: To receive hardware information from client, l2.ini NetSendHardWare must be set to true.
 # Default: False
 EnableHardwareInfo = False
 
+# Players without hardware information are kicked from the game.
+# Automatically set to True when MaxPlayersPerHWID > 0.
+# Default: False
+KickMissingHWID = False
+
 # Maximum number of players per HWID allowed to enter game.
 # Default: 0 (unlimited)
 MaxPlayersPerHWID = 0

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/Config.java

@@ -751,6 +751,7 @@ public class Config
 	public static int BACKUP_DAYS;
 	public static int MAXIMUM_ONLINE_USERS;
 	public static boolean HARDWARE_INFO_ENABLED;
+	public static boolean KICK_MISSING_HWID;
 	public static int MAX_PLAYERS_PER_HWID;
 	public static Pattern CHARNAME_TEMPLATE_PATTERN;
 	public static String PET_NAME_TEMPLATE;
@@ -1346,7 +1347,12 @@ public class Config
 			MAX_CHARACTERS_NUMBER_PER_ACCOUNT = serverSettings.getInt("CharMaxNumber", 7);
 			MAXIMUM_ONLINE_USERS = serverSettings.getInt("MaximumOnlineUsers", 100);
 			HARDWARE_INFO_ENABLED = serverSettings.getBoolean("EnableHardwareInfo", false);
+			KICK_MISSING_HWID = serverSettings.getBoolean("KickMissingHWID", false);
 			MAX_PLAYERS_PER_HWID = serverSettings.getInt("MaxPlayersPerHWID", 0);
+			if (MAX_PLAYERS_PER_HWID > 0)
+			{
+				KICK_MISSING_HWID = true;
+			}
 			final String[] protocols = serverSettings.getString("AllowedProtocolRevisions", "603;606;607").split(";");
 			PROTOCOL_LIST = new ArrayList<>(protocols.length);
 			for (String protocol : protocols)

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java

@@ -698,13 +698,11 @@ public class EnterWorld implements IClientIncomingPacket
 				}
 				
 				// Check max players.
-				if (Config.MAX_PLAYERS_PER_HWID > 0)
+				if (Config.KICK_MISSING_HWID && (hwInfo == null))
-				{
-					if (hwInfo == null)
 				{
 					Disconnection.of(client).defaultSequence(false);
 				}
-					else
+				else if (Config.MAX_PLAYERS_PER_HWID > 0)
 				{
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
@@ -719,7 +717,6 @@ public class EnterWorld implements IClientIncomingPacket
 						Disconnection.of(client).defaultSequence(false);
 					}
 				}
-				}
 			}, 5000);
 		}
 	}

L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Server.ini

@@ -162,11 +162,15 @@ RestartOnDeadlock = False
 # ---------------------------------------------------------------------------
 
 # Check if hardware information is sent upon login.
-# Players without hardware information are kicked from the game.
 # WARNING: To receive hardware information from client, l2.ini NetSendHardWare must be set to true.
 # Default: False
 EnableHardwareInfo = False
 
+# Players without hardware information are kicked from the game.
+# Automatically set to True when MaxPlayersPerHWID > 0.
+# Default: False
+KickMissingHWID = False
+
 # Maximum number of players per HWID allowed to enter game.
 # Default: 0 (unlimited)
 MaxPlayersPerHWID = 0

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java

@@ -755,6 +755,7 @@ public class Config
 	public static int BACKUP_DAYS;
 	public static int MAXIMUM_ONLINE_USERS;
 	public static boolean HARDWARE_INFO_ENABLED;
+	public static boolean KICK_MISSING_HWID;
 	public static int MAX_PLAYERS_PER_HWID;
 	public static Pattern CHARNAME_TEMPLATE_PATTERN;
 	public static String PET_NAME_TEMPLATE;
@@ -1354,7 +1355,12 @@ public class Config
 			MAX_CHARACTERS_NUMBER_PER_ACCOUNT = serverSettings.getInt("CharMaxNumber", 7);
 			MAXIMUM_ONLINE_USERS = serverSettings.getInt("MaximumOnlineUsers", 100);
 			HARDWARE_INFO_ENABLED = serverSettings.getBoolean("EnableHardwareInfo", false);
+			KICK_MISSING_HWID = serverSettings.getBoolean("KickMissingHWID", false);
 			MAX_PLAYERS_PER_HWID = serverSettings.getInt("MaxPlayersPerHWID", 0);
+			if (MAX_PLAYERS_PER_HWID > 0)
+			{
+				KICK_MISSING_HWID = true;
+			}
 			final String[] protocols = serverSettings.getString("AllowedProtocolRevisions", "603;606;607").split(";");
 			PROTOCOL_LIST = new ArrayList<>(protocols.length);
 			for (String protocol : protocols)

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java

@@ -718,13 +718,11 @@ public class EnterWorld implements IClientIncomingPacket
 				}
 				
 				// Check max players.
-				if (Config.MAX_PLAYERS_PER_HWID > 0)
+				if (Config.KICK_MISSING_HWID && (hwInfo == null))
-				{
-					if (hwInfo == null)
 				{
 					Disconnection.of(client).defaultSequence(false);
 				}
-					else
+				else if (Config.MAX_PLAYERS_PER_HWID > 0)
 				{
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
@@ -739,7 +737,6 @@ public class EnterWorld implements IClientIncomingPacket
 						Disconnection.of(client).defaultSequence(false);
 					}
 				}
-				}
 			}, 5000);
 		}
 	}

L2J_Mobius_Classic_Interlude/dist/game/config/Server.ini

@@ -162,11 +162,15 @@ RestartOnDeadlock = False
 # ---------------------------------------------------------------------------
 
 # Check if hardware information is sent upon login.
-# Players without hardware information are kicked from the game.
 # WARNING: To receive hardware information from client, l2.ini NetSendHardWare must be set to true.
 # Default: False
 EnableHardwareInfo = False
 
+# Players without hardware information are kicked from the game.
+# Automatically set to True when MaxPlayersPerHWID > 0.
+# Default: False
+KickMissingHWID = False
+
 # Maximum number of players per HWID allowed to enter game.
 # Default: 0 (unlimited)
 MaxPlayersPerHWID = 0

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/Config.java

@@ -760,6 +760,7 @@ public class Config
 	public static int BACKUP_DAYS;
 	public static int MAXIMUM_ONLINE_USERS;
 	public static boolean HARDWARE_INFO_ENABLED;
+	public static boolean KICK_MISSING_HWID;
 	public static int MAX_PLAYERS_PER_HWID;
 	public static Pattern CHARNAME_TEMPLATE_PATTERN;
 	public static String PET_NAME_TEMPLATE;
@@ -1355,7 +1356,12 @@ public class Config
 			MAX_CHARACTERS_NUMBER_PER_ACCOUNT = serverSettings.getInt("CharMaxNumber", 7);
 			MAXIMUM_ONLINE_USERS = serverSettings.getInt("MaximumOnlineUsers", 100);
 			HARDWARE_INFO_ENABLED = serverSettings.getBoolean("EnableHardwareInfo", false);
+			KICK_MISSING_HWID = serverSettings.getBoolean("KickMissingHWID", false);
 			MAX_PLAYERS_PER_HWID = serverSettings.getInt("MaxPlayersPerHWID", 0);
+			if (MAX_PLAYERS_PER_HWID > 0)
+			{
+				KICK_MISSING_HWID = true;
+			}
 			final String[] protocols = serverSettings.getString("AllowedProtocolRevisions", "603;606;607").split(";");
 			PROTOCOL_LIST = new ArrayList<>(protocols.length);
 			for (String protocol : protocols)

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java

@@ -696,13 +696,11 @@ public class EnterWorld implements IClientIncomingPacket
 				}
 				
 				// Check max players.
-				if (Config.MAX_PLAYERS_PER_HWID > 0)
+				if (Config.KICK_MISSING_HWID && (hwInfo == null))
-				{
-					if (hwInfo == null)
 				{
 					Disconnection.of(client).defaultSequence(false);
 				}
-					else
+				else if (Config.MAX_PLAYERS_PER_HWID > 0)
 				{
 					int count = 0;
 					for (PlayerInstance plr : World.getInstance().getPlayers())
@@ -717,7 +715,6 @@ public class EnterWorld implements IClientIncomingPacket
 						Disconnection.of(client).defaultSequence(false);
 					}
 				}
-				}
 			}, 5000);
 		}
 	}