From 60856fe5ce757ba50cce1b19090e82f74a5cc08a Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 15 Apr 2019 20:15:27 +0000
Subject: [PATCH] Fixed probable GameServerThread NPE.

---
 .../java/org/l2jmobius/loginserver/GameServerThread.java   | 7 +++++--
 .../java/org/l2jmobius/loginserver/GameServerThread.java   | 7 +++++--
 .../java/org/l2jmobius/loginserver/GameServerThread.java   | 7 +++++--
 .../java/org/l2jmobius/loginserver/GameServerThread.java   | 7 +++++--
 .../java/org/l2jmobius/loginserver/GameServerThread.java   | 7 +++++--
 .../java/org/l2jmobius/loginserver/GameServerThread.java   | 7 +++++--
 .../java/org/l2jmobius/loginserver/GameServerThread.java   | 7 +++++--
 .../java/org/l2jmobius/loginserver/GameServerThread.java   | 7 +++++--
 .../java/org/l2jmobius/loginserver/GameServerThread.java   | 7 +++++--
 .../java/org/l2jmobius/loginserver/GameServerThread.java   | 7 +++++--
 .../java/org/l2jmobius/loginserver/GameServerThread.java   | 7 +++++--
 .../java/org/l2jmobius/loginserver/GameServerThread.java   | 7 +++++--
 12 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/GameServerThread.java
index 15041555fd..d893573d8e 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/GameServerThread.java
@@ -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);
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/GameServerThread.java
index 15041555fd..d893573d8e 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/GameServerThread.java
@@ -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);
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/GameServerThread.java
index 15041555fd..d893573d8e 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/GameServerThread.java
@@ -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);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/GameServerThread.java
index 15041555fd..d893573d8e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/GameServerThread.java
@@ -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);
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/GameServerThread.java
index 15041555fd..d893573d8e 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/GameServerThread.java
@@ -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);
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/GameServerThread.java
index 15041555fd..d893573d8e 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/GameServerThread.java
@@ -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);
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/GameServerThread.java
index 15041555fd..d893573d8e 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/GameServerThread.java
@@ -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);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/GameServerThread.java
index 89ef8f9481..a8089b64e2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/GameServerThread.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/GameServerThread.java
index 15041555fd..d893573d8e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/GameServerThread.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/GameServerThread.java
index 15041555fd..d893573d8e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/GameServerThread.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/GameServerThread.java
index 15041555fd..d893573d8e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/GameServerThread.java
@@ -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);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/GameServerThread.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/GameServerThread.java
index 15041555fd..d893573d8e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/GameServerThread.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/GameServerThread.java
@@ -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);