From 0bb4e57aadb31f9455eaee84c55a80410a536951 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 13 Aug 2016 22:47:10 +0000 Subject: [PATCH] RequestHardWareInfo improvements. --- trunk/dist/game/config/Server.ini | 3 +- .../dist/game/data/html/admin/charhwinfo.htm | 13 ++--- .../admincommandhandlers/AdminHwid.java | 1 - .../network/client/ExIncomingPackets.java | 2 +- .../network/clientpackets/EnterWorld.java | 55 +++++++------------ .../clientpackets/RequestHardWareInfo.java | 26 +++++++-- 6 files changed, 50 insertions(+), 50 deletions(-) diff --git a/trunk/dist/game/config/Server.ini b/trunk/dist/game/config/Server.ini index 2603491df8..b73348b564 100644 --- a/trunk/dist/game/config/Server.ini +++ b/trunk/dist/game/config/Server.ini @@ -115,7 +115,8 @@ ServerListBrackets = False # Check if hardware information is sent upon login. # Players without hardware information are kicked from the game. -# To receive hardware information from client, l2.ini NetSendHardWare must be set to true. +# WARNING: To receive hardware information from client, l2.ini NetSendHardWare must be set to true. +# WARNING: The file system\HardWare.ini must be deleted each time the player logins.(?) # Default: False EnableHardwareInfo = False diff --git a/trunk/dist/game/data/html/admin/charhwinfo.htm b/trunk/dist/game/data/html/admin/charhwinfo.htm index d65175b253..4527ae9322 100644 --- a/trunk/dist/game/data/html/admin/charhwinfo.htm +++ b/trunk/dist/game/data/html/admin/charhwinfo.htm @@ -13,13 +13,12 @@
CPU:%cpuName%
CPU Speed:%cpuSpeed%
CPU Core Count:%cpuCoreCount%
-
VGA:%vgaName%
-
VGA Version:%vgaVersion%
-
VGA Driver Version:%vgaDriverVersion%
-
Windows Platform Id:%windowsPlatformId%
-
Windows Major Version:%windowsMajorVersion%
-
Windows Minor Version:%windowsMinorVersion%
-
Windows Build:%windowsBuildNumber%
+
VGA:%vgaName%
+
VGA Driver Version:%vgaDriverVersion%
+
Windows Platform Id:%windowsPlatformId%
+
Windows Major Version:%windowsMajorVersion%
+
Windows Minor Version:%windowsMinorVersion%
+
Windows Build:%windowsBuildNumber%
\ No newline at end of file diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminHwid.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminHwid.java index a2f7af5523..b0825a64f4 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminHwid.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminHwid.java @@ -51,7 +51,6 @@ public class AdminHwid implements IAdminCommandHandler html.replace("%cpuName%", target.getClient().getHardwareInfo().getCpuName()); html.replace("%cpuSpeed%", target.getClient().getHardwareInfo().getCpuSpeed()); html.replace("%cpuCoreCount%", target.getClient().getHardwareInfo().getCpuCoreCount()); - html.replace("%vgaVersion%", target.getClient().getHardwareInfo().getVgaVersion()); html.replace("%vgaName%", target.getClient().getHardwareInfo().getVgaName()); html.replace("%vgaDriverVersion%", target.getClient().getHardwareInfo().getVgaDriverVersion()); activeChar.sendPacket(html); diff --git a/trunk/java/com/l2jmobius/gameserver/network/client/ExIncomingPackets.java b/trunk/java/com/l2jmobius/gameserver/network/client/ExIncomingPackets.java index 67bec079ca..a5434ae139 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/client/ExIncomingPackets.java +++ b/trunk/java/com/l2jmobius/gameserver/network/client/ExIncomingPackets.java @@ -261,7 +261,7 @@ public enum ExIncomingPackets implements IIncomingPackets REQUEST_GOODS_INVENTORY_ITEM(0xAB, null, ConnectionState.IN_GAME), REQUEST_FIRST_PLAY_START(0xAC, null, ConnectionState.IN_GAME), REQUEST_FLY_MOVE_START(0xAD, RequestFlyMoveStart::new, ConnectionState.IN_GAME), - REQUEST_HARDWARE_INFO(0xAE, RequestHardWareInfo::new, ConnectionState.IN_GAME), + REQUEST_HARDWARE_INFO(0xAE, RequestHardWareInfo::new, ConnectionState.values()), SEND_CHANGE_ATTRIBUTE_TARGET_ITEM(0xB0, null, ConnectionState.IN_GAME), REQUEST_CHANGE_ATTRIBUTE_ITEM(0xB1, null, ConnectionState.IN_GAME), REQUEST_CHANGE_ATTRIBUTE_CANCEL(0xB2, null, ConnectionState.IN_GAME), diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 49ad61fbbb..09330345d5 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -19,6 +19,7 @@ package com.l2jmobius.gameserver.network.clientpackets; import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; import com.l2jmobius.gameserver.LoginServerThread; +import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.cache.HtmCache; import com.l2jmobius.gameserver.data.sql.impl.AnnouncementsTable; import com.l2jmobius.gameserver.data.sql.impl.OfflineTradersTable; @@ -94,7 +95,6 @@ import com.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll; import com.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate; import com.l2jmobius.gameserver.network.serverpackets.PledgeSkillList; import com.l2jmobius.gameserver.network.serverpackets.QuestList; -import com.l2jmobius.gameserver.network.serverpackets.ServerClose; import com.l2jmobius.gameserver.network.serverpackets.ShortCutInit; import com.l2jmobius.gameserver.network.serverpackets.SkillCoolTime; import com.l2jmobius.gameserver.network.serverpackets.SkillList; @@ -119,13 +119,6 @@ public class EnterWorld implements IClientIncomingPacket @Override public boolean read(L2GameClient client, PacketReader packet) { - packet.readB(32); // Unknown Byte Array - packet.readD(); // Unknown Value - packet.readD(); // Unknown Value - packet.readD(); // Unknown Value - packet.readD(); // Unknown Value - packet.readB(32); // Unknown Byte Array - packet.readD(); // Unknown Value for (int i = 0; i < 5; i++) { for (int o = 0; o < 4; o++) @@ -133,38 +126,18 @@ public class EnterWorld implements IClientIncomingPacket tracert[i][o] = packet.readC(); } } + packet.readD(); // Unknown Value + packet.readD(); // Unknown Value + packet.readD(); // Unknown Value + packet.readD(); // Unknown Value + packet.readB(64); // Unknown Byte Array + packet.readD(); // Unknown Value return true; } @Override public void run(L2GameClient client) { - // HWID - if (Config.HARDWARE_INFO_ENABLED) - { - if (client.getHardwareInfo() == null) - { - client.close(ServerClose.STATIC_PACKET); - return; - } - if (Config.MAX_PLAYERS_PER_HWID > 0) - { - int count = 0; - for (L2PcInstance player : L2World.getInstance().getPlayers()) - { - if ((player.isOnlineInt() == 1) && (player.getClient().getHardwareInfo().equals(client.getHardwareInfo()))) - { - count++; - } - } - if (count >= Config.MAX_PLAYERS_PER_HWID) - { - client.close(ServerClose.STATIC_PACKET); - return; - } - } - } - final L2PcInstance activeChar = client.getActiveChar(); if (activeChar == null) { @@ -355,7 +328,7 @@ public class EnterWorld implements IClientIncomingPacket } // Send GG check - activeChar.queryGameGuard(); + // activeChar.queryGameGuard(); // Send Dye Information activeChar.sendPacket(new HennaInfo(activeChar)); @@ -656,6 +629,18 @@ public class EnterWorld implements IClientIncomingPacket activeChar.sendPacket(new ExAutoSoulShot(0, false, 2)); activeChar.sendPacket(new ExAutoSoulShot(0, false, 3)); } + + if (Config.HARDWARE_INFO_ENABLED) + { + ThreadPoolManager.getInstance().scheduleGeneral(() -> + { + if (client.getHardwareInfo() == null) + { + client.closeNow(); + return; + } + }, 5000); + } } /** diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestHardWareInfo.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestHardWareInfo.java index 17448bbe52..40d8d0ed6b 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestHardWareInfo.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestHardWareInfo.java @@ -16,7 +16,10 @@ */ package com.l2jmobius.gameserver.network.clientpackets; +import com.l2jmobius.Config; import com.l2jmobius.commons.network.PacketReader; +import com.l2jmobius.gameserver.model.L2World; +import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.holders.ClientHardwareInfoHolder; import com.l2jmobius.gameserver.network.client.L2GameClient; @@ -55,10 +58,7 @@ public final class RequestHardWareInfo implements IClientIncomingPacket _windowsBuildNumber = packet.readD(); _directxVersion = packet.readD(); _directxRevision = packet.readD(); - for (int i = 0; i < 16; i++) - { - packet.readC(); - } + packet.readB(16); _cpuName = packet.readS(); _cpuSpeed = packet.readD(); _cpuCoreCount = packet.readC(); @@ -71,7 +71,7 @@ public final class RequestHardWareInfo implements IClientIncomingPacket packet.readC(); _videoMemory = packet.readD(); packet.readD(); - _vgaVersion = packet.readD(); + _vgaVersion = packet.readH(); _vgaName = packet.readS(); _vgaDriverVersion = packet.readS(); return true; @@ -81,5 +81,21 @@ public final class RequestHardWareInfo implements IClientIncomingPacket public void run(L2GameClient client) { client.setHardwareInfo(new ClientHardwareInfoHolder(_macAddress, _windowsPlatformId, _windowsMajorVersion, _windowsMinorVersion, _windowsBuildNumber, _directxVersion, _directxRevision, _cpuName, _cpuSpeed, _cpuCoreCount, _vgaCount, _vgaPcxSpeed, _physMemorySlot1, _physMemorySlot2, _physMemorySlot3, _videoMemory, _vgaVersion, _vgaName, _vgaDriverVersion)); + if (Config.HARDWARE_INFO_ENABLED && (Config.MAX_PLAYERS_PER_HWID > 0)) + { + int count = 0; + for (L2PcInstance player : L2World.getInstance().getPlayers()) + { + if ((player.isOnlineInt() == 1) && (player.getClient().getHardwareInfo().equals(client.getHardwareInfo()))) + { + count++; + } + } + if (count >= Config.MAX_PLAYERS_PER_HWID) + { + client.closeNow(); + return; + } + } } }