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) {