From 37e5ece16d5754f91926cfbbc5c661fd80a62cc6 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 31 Oct 2017 10:42:37 +0000
Subject: [PATCH] Fixed possible deleteInstanceTime NPE.

---
 .../gameserver/instancemanager/InstanceManager.java          | 5 ++++-
 .../gameserver/instancemanager/InstanceManager.java          | 5 ++++-
 .../gameserver/instancemanager/InstanceManager.java          | 5 ++++-
 .../gameserver/instancemanager/InstanceManager.java          | 5 ++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
index 61cd788abf..a8b7065ef7 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
@@ -625,7 +625,10 @@ public final class InstanceManager implements IGameXmlReader
 			ps.setInt(1, player.getObjectId());
 			ps.setInt(2, id);
 			ps.execute();
-			_playerInstanceTimes.get(player.getObjectId()).remove(id);
+			if (_playerInstanceTimes.get(player.getObjectId()) != null)
+			{
+				_playerInstanceTimes.get(player.getObjectId()).remove(id);
+			}
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
index 61cd788abf..a8b7065ef7 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
@@ -625,7 +625,10 @@ public final class InstanceManager implements IGameXmlReader
 			ps.setInt(1, player.getObjectId());
 			ps.setInt(2, id);
 			ps.execute();
-			_playerInstanceTimes.get(player.getObjectId()).remove(id);
+			if (_playerInstanceTimes.get(player.getObjectId()) != null)
+			{
+				_playerInstanceTimes.get(player.getObjectId()).remove(id);
+			}
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
index 61cd788abf..a8b7065ef7 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
@@ -625,7 +625,10 @@ public final class InstanceManager implements IGameXmlReader
 			ps.setInt(1, player.getObjectId());
 			ps.setInt(2, id);
 			ps.execute();
-			_playerInstanceTimes.get(player.getObjectId()).remove(id);
+			if (_playerInstanceTimes.get(player.getObjectId()) != null)
+			{
+				_playerInstanceTimes.get(player.getObjectId()).remove(id);
+			}
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
index 61cd788abf..a8b7065ef7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
@@ -625,7 +625,10 @@ public final class InstanceManager implements IGameXmlReader
 			ps.setInt(1, player.getObjectId());
 			ps.setInt(2, id);
 			ps.execute();
-			_playerInstanceTimes.get(player.getObjectId()).remove(id);
+			if (_playerInstanceTimes.get(player.getObjectId()) != null)
+			{
+				_playerInstanceTimes.get(player.getObjectId()).remove(id);
+			}
 		}
 		catch (Exception e)
 		{