lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HWID system adjustments.

Browse Source
This commit is contained in:
MobiusDevelopment 2022-01-09 02:10:33 +00:00
parent 9c068db77f
commit 5bbdffa29d
46 changed files with 46 additions and 644 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -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);
}

28
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

2
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -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);
}

28
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

2
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -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);
}

28
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

2
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -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);
}

28
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

2
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -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);
}

28
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

2
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -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);
}

28
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

2
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -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);
}

28
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

2
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -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);
}

28
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -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);
}

28
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

2
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -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);
}

28
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -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);
}

28
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -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);
}

28
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -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);
}

28
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

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

@ -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);
}

28
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

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

@ -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);
}

28
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

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

@ -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);
}

28
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

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

@ -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);
}

28
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

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

@ -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);
}

28
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

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

@ -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);
}

28
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

2
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -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);
}

28
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

2
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -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);
}

28
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

2
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -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);
}

28
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/holders/ClientHardwareInfoHolder.java
View File

@ -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());
}
}

2
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -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);
}