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

Fixed probable GameServerThread NPE.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-04-15 20:15:27 +00:00
parent 3b7441b7e7
commit 60856fe5ce
12 changed files with 60 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/GameServerThread.java
View File

@ -135,9 +135,12 @@ public class GameServerThread extends Thread
finally finally
{ {
if (isAuthed()) if (isAuthed())
{
if (_gsi != null)
{ {
_gsi.setDown(); _gsi.setDown();
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); }
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected.");
} }
LoginServer.getInstance().getGameServerListener().removeGameServer(this); LoginServer.getInstance().getGameServerListener().removeGameServer(this);
LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp);

5
L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/GameServerThread.java
View File

@ -135,9 +135,12 @@ public class GameServerThread extends Thread
finally finally
{ {
if (isAuthed()) if (isAuthed())
{
if (_gsi != null)
{ {
_gsi.setDown(); _gsi.setDown();
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); }
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected.");
} }
LoginServer.getInstance().getGameServerListener().removeGameServer(this); LoginServer.getInstance().getGameServerListener().removeGameServer(this);
LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp);

5
L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/GameServerThread.java
View File

@ -135,9 +135,12 @@ public class GameServerThread extends Thread
finally finally
{ {
if (isAuthed()) if (isAuthed())
{
if (_gsi != null)
{ {
_gsi.setDown(); _gsi.setDown();
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); }
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected.");
} }
LoginServer.getInstance().getGameServerListener().removeGameServer(this); LoginServer.getInstance().getGameServerListener().removeGameServer(this);
LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp);

5
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/GameServerThread.java
View File

@ -135,9 +135,12 @@ public class GameServerThread extends Thread
finally finally
{ {
if (isAuthed()) if (isAuthed())
{
if (_gsi != null)
{ {
_gsi.setDown(); _gsi.setDown();
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); }
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected.");
} }
LoginServer.getInstance().getGameServerListener().removeGameServer(this); LoginServer.getInstance().getGameServerListener().removeGameServer(this);
LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp);

5
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/GameServerThread.java
View File

@ -135,9 +135,12 @@ public class GameServerThread extends Thread
finally finally
{ {
if (isAuthed()) if (isAuthed())
{
if (_gsi != null)
{ {
_gsi.setDown(); _gsi.setDown();
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); }
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected.");
} }
LoginServer.getInstance().getGameServerListener().removeGameServer(this); LoginServer.getInstance().getGameServerListener().removeGameServer(this);
LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp);

5
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/GameServerThread.java
View File

@ -135,9 +135,12 @@ public class GameServerThread extends Thread
finally finally
{ {
if (isAuthed()) if (isAuthed())
{
if (_gsi != null)
{ {
_gsi.setDown(); _gsi.setDown();
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); }
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected.");
} }
LoginServer.getInstance().getGameServerListener().removeGameServer(this); LoginServer.getInstance().getGameServerListener().removeGameServer(this);
LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp);

5
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/GameServerThread.java
View File

@ -135,9 +135,12 @@ public class GameServerThread extends Thread
finally finally
{ {
if (isAuthed()) if (isAuthed())
{
if (_gsi != null)
{ {
_gsi.setDown(); _gsi.setDown();
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); }
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected.");
} }
LoginServer.getInstance().getGameServerListener().removeGameServer(this); LoginServer.getInstance().getGameServerListener().removeGameServer(this);
LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp);

5
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/GameServerThread.java
View File

@ -135,9 +135,12 @@ public class GameServerThread extends Thread
finally finally
{ {
if (isAuthed()) if (isAuthed())
{
if (_gsi != null)
{ {
_gsi.setDown(); _gsi.setDown();
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); }
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected.");
} }
LoginServer.getInstance().getGameServerListener().removeGameServer(this); LoginServer.getInstance().getGameServerListener().removeGameServer(this);
LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp);

5
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/GameServerThread.java
View File

@ -135,9 +135,12 @@ public class GameServerThread extends Thread
finally finally
{ {
if (isAuthed()) if (isAuthed())
{
if (_gsi != null)
{ {
_gsi.setDown(); _gsi.setDown();
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); }
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected.");
} }
LoginServer.getInstance().getGameServerListener().removeGameServer(this); LoginServer.getInstance().getGameServerListener().removeGameServer(this);
LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp);

5
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/GameServerThread.java
View File

@ -135,9 +135,12 @@ public class GameServerThread extends Thread
finally finally
{ {
if (isAuthed()) if (isAuthed())
{
if (_gsi != null)
{ {
_gsi.setDown(); _gsi.setDown();
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); }
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected.");
} }
LoginServer.getInstance().getGameServerListener().removeGameServer(this); LoginServer.getInstance().getGameServerListener().removeGameServer(this);
LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp);

5
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/GameServerThread.java
View File

@ -135,9 +135,12 @@ public class GameServerThread extends Thread
finally finally
{ {
if (isAuthed()) if (isAuthed())
{
if (_gsi != null)
{ {
_gsi.setDown(); _gsi.setDown();
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); }
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected.");
} }
LoginServer.getInstance().getGameServerListener().removeGameServer(this); LoginServer.getInstance().getGameServerListener().removeGameServer(this);
LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp);

5
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/GameServerThread.java
View File

@ -135,9 +135,12 @@ public class GameServerThread extends Thread
finally finally
{ {
if (isAuthed()) if (isAuthed())
{
if (_gsi != null)
{ {
_gsi.setDown(); _gsi.setDown();
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected"); }
LOGGER.info("Server [" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) + " is now set as disconnected.");
} }
LoginServer.getInstance().getGameServerListener().removeGameServer(this); LoginServer.getInstance().getGameServerListener().removeGameServer(this);
LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp); LoginServer.getInstance().getGameServerListener().removeFloodProtection(_connectionIp);