Fixed probable GameServerThread NPE.

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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