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

Fixed probable hardware info holder NPE.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-08-07 00:35:27 +00:00
parent d5387bb853
commit a261be39a8
23 changed files with 138 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -695,9 +695,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

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

@ -733,9 +733,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

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

@ -733,9 +733,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

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

@ -733,9 +733,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

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

@ -739,9 +739,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

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

@ -739,9 +739,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

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

@ -739,9 +739,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

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

@ -745,9 +745,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

8
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -762,9 +762,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

8
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -772,9 +772,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

8
L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -772,9 +772,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

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

@ -694,9 +694,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

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

@ -693,9 +693,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

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

@ -720,9 +720,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

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

@ -720,9 +720,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

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

@ -730,9 +730,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

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

@ -730,9 +730,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

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

@ -730,9 +730,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

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

@ -734,9 +734,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

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

@ -716,9 +716,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

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

@ -768,9 +768,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

8
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -782,9 +782,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)

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

@ -782,9 +782,13 @@ public class EnterWorld implements IClientIncomingPacket
int count = 0;
for (PlayerInstance plr : World.getInstance().getPlayers())
{
if ((plr.isOnlineInt() == 1) && (plr.getClient().getHardwareInfo().equals(hwInfo)))
if (plr.isOnlineInt() == 1)
{
count++;
final ClientHardwareInfoHolder hwi = plr.getClient().getHardwareInfo();
if ((hwi != null) && hwi.equals(hwInfo))
{
count++;
}
}
}
if (count >= Config.MAX_PLAYERS_PER_HWID)