From 80e24715f688067dc82f03f9b7b6822cadb42646 Mon Sep 17 00:00:00 2001 From: Gravit Date: Wed, 16 Oct 2019 22:50:35 +0700 Subject: [PATCH] =?UTF-8?q?[FEATURE]=20=D0=9F=D0=BE=D0=B4=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D1=87=D0=B8=D1=81=D0=BB?= =?UTF-8?q?=D0=B0=20=D1=81=D1=80=D0=B0=D0=B2=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20HWID=20=D0=BF=D1=80=D0=B8=20compareMode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/pro/gravit/launcher/hwid/OshiHWID.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/hwid/OshiHWID.java b/LauncherAPI/src/main/java/pro/gravit/launcher/hwid/OshiHWID.java index 3d0656a7..efced953 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/hwid/OshiHWID.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/hwid/OshiHWID.java @@ -27,7 +27,7 @@ public int getLevel() //Уровень доверия, насколько уни if (totalMemory != 0) result += 32; if (serialNumber != null) result += isRealSerialNumber() ? 20 : 3; if (HWDiskSerial != null && !HWDiskSerial.isEmpty()) result += 38; - if (processorID != null && !processorID.isEmpty()) result += 20; + if (processorID != null && !processorID.isEmpty()) result += 15; if (macAddr != null && !macAddr.isEmpty()) result += 25; return result; } @@ -43,10 +43,10 @@ public int compare(HWID hwid) { int rate = 0; OshiHWID oshi = (OshiHWID) hwid; if (Math.abs(oshi.totalMemory - totalMemory) < 1024 * 1024) rate += 5; - if (oshi.totalMemory == totalMemory) rate += 15; - if (oshi.HWDiskSerial.equals(HWDiskSerial)) rate += 45; - if (oshi.processorID.equals(processorID)) rate += 18; - if (oshi.serialNumber.equals(serialNumber)) rate += 15; + if (oshi.totalMemory == totalMemory) rate += 32; + if (oshi.HWDiskSerial.equals(HWDiskSerial) && !HWDiskSerial.isEmpty()) rate += 38; + if (oshi.processorID.equals(processorID) && !processorID.isEmpty()) rate += 15; + if (oshi.serialNumber.equals(serialNumber)) rate += isRealSerialNumber() ? 20 : 3; if (!oshi.macAddr.isEmpty() && oshi.macAddr.equals(macAddr)) rate += 19; return rate; }