From 5bbdffa29da63650c997885b542af1c0166e4ba0 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 9 Jan 2022 02:10:33 +0000 Subject: [PATCH] HWID system adjustments. --- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- .../holders/ClientHardwareInfoHolder.java | 28 +------------------ .../network/clientpackets/EnterWorld.java | 2 +- 46 files changed, 46 insertions(+), 644 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index b4a2ba34ad..207508a51a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -691,7 +691,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 4ad9a2b04d..33c2c361ed 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -729,7 +729,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 4ad9a2b04d..33c2c361ed 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -729,7 +729,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 8446df1a3b..250eef9257 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -729,7 +729,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 2429d1f313..810c1eee25 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -735,7 +735,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 9c076f8127..f5d37a1f53 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -735,7 +735,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 9c076f8127..f5d37a1f53 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -735,7 +735,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 063bd6824e..bfe1cb7728 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -745,7 +745,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 6b147f803d..60c533461d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -766,7 +766,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index c17d517421..aa4163b3e6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -776,7 +776,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 2a31663ba8..7bfde0dd63 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -780,7 +780,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index d0984a826d..8b3934a53b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -698,7 +698,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 473d7d7ac2..895345f752 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -697,7 +697,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 5c0a6275f2..b024f707e9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -708,7 +708,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 0701ae1aac..50ffca3d2e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -708,7 +708,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index cb8bfca9db..fd38528eee 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -718,7 +718,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index cb8bfca9db..fd38528eee 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -718,7 +718,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index cb8bfca9db..fd38528eee 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -718,7 +718,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 9eaf88ad5c..a8deea6374 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -726,7 +726,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index eb04872332..b2b5fe9770 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -704,7 +704,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 999d00ac29..7c66ef777b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -763,7 +763,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 250ff49cac..b1fc80b670 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -777,7 +777,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java index d2396e61e9..0553a7cfa8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java @@ -293,32 +293,6 @@ public class ClientHardwareInfoHolder @Override public boolean equals(Object obj) { - if (obj instanceof ClientHardwareInfoHolder) - { - final ClientHardwareInfoHolder info = (ClientHardwareInfoHolder) obj; - if ((_macAddress.equals(info.getMacAddress())) && // - (_windowsPlatformId == info.getWindowsPlatformId()) && // - (_windowsMajorVersion == info.getWindowsMajorVersion()) && // - (_windowsMinorVersion == info.getWindowsMinorVersion()) && // - (_windowsBuildNumber == info.getWindowsBuildNumber()) && // - (_directxVersion == info.getDirectxVersion()) && // - (_directxRevision == info.getDirectxRevision()) && // - (_cpuName.equals(info.getCpuName())) && // - (_cpuSpeed == info.getCpuSpeed()) && // - (_cpuCoreCount == info.getCpuCoreCount()) && // - (_vgaCount == info.getVgaCount()) && // - (_vgaPcxSpeed == info.getVgaPcxSpeed()) && // - (_physMemorySlot1 == info.getPhysMemorySlot1()) && // - (_physMemorySlot2 == info.getPhysMemorySlot2()) && // - (_physMemorySlot3 == info.getPhysMemorySlot3()) && // - (_videoMemory == info.getVideoMemory()) && // - (_vgaVersion == info.getVgaVersion()) && // - (_vgaName.equals(info.getVgaName())) && // - (_vgaDriverVersion.equals(info.getVgaDriverVersion()))) - { - return true; - } - } - return false; + return (obj instanceof ClientHardwareInfoHolder) && _macAddress.equals(((ClientHardwareInfoHolder) obj).getMacAddress()); } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 05fc2c688d..90a84c3b28 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -777,7 +777,7 @@ public class EnterWorld implements IClientIncomingPacket } } } - if (count >= Config.MAX_PLAYERS_PER_HWID) + if (count > Config.MAX_PLAYERS_PER_HWID) { Disconnection.of(client).defaultSequence(LeaveWorld.STATIC_PACKET); }