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

Fixed possible deleteInstanceTime NPE.

Browse Source
This commit is contained in:
MobiusDev 2017-10-31 10:42:37 +00:00
parent b276cf2695
commit 37e5ece16d
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
View File

@ -625,8 +625,11 @@ public final class InstanceManager implements IGameXmlReader
ps.setInt(1, player.getObjectId()); ps.setInt(1, player.getObjectId());
ps.setInt(2, id); ps.setInt(2, id);
ps.execute(); ps.execute();
if (_playerInstanceTimes.get(player.getObjectId()) != null)
{
_playerInstanceTimes.get(player.getObjectId()).remove(id); _playerInstanceTimes.get(player.getObjectId()).remove(id);
} }
}
catch (Exception e) catch (Exception e)
{ {
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not delete character instance reenter data: ", e); LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not delete character instance reenter data: ", e);

3
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
View File

@ -625,8 +625,11 @@ public final class InstanceManager implements IGameXmlReader
ps.setInt(1, player.getObjectId()); ps.setInt(1, player.getObjectId());
ps.setInt(2, id); ps.setInt(2, id);
ps.execute(); ps.execute();
if (_playerInstanceTimes.get(player.getObjectId()) != null)
{
_playerInstanceTimes.get(player.getObjectId()).remove(id); _playerInstanceTimes.get(player.getObjectId()).remove(id);
} }
}
catch (Exception e) catch (Exception e)
{ {
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not delete character instance reenter data: ", e); LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not delete character instance reenter data: ", e);

3
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
View File

@ -625,8 +625,11 @@ public final class InstanceManager implements IGameXmlReader
ps.setInt(1, player.getObjectId()); ps.setInt(1, player.getObjectId());
ps.setInt(2, id); ps.setInt(2, id);
ps.execute(); ps.execute();
if (_playerInstanceTimes.get(player.getObjectId()) != null)
{
_playerInstanceTimes.get(player.getObjectId()).remove(id); _playerInstanceTimes.get(player.getObjectId()).remove(id);
} }
}
catch (Exception e) catch (Exception e)
{ {
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not delete character instance reenter data: ", e); LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not delete character instance reenter data: ", e);

3
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
View File

@ -625,8 +625,11 @@ public final class InstanceManager implements IGameXmlReader
ps.setInt(1, player.getObjectId()); ps.setInt(1, player.getObjectId());
ps.setInt(2, id); ps.setInt(2, id);
ps.execute(); ps.execute();
if (_playerInstanceTimes.get(player.getObjectId()) != null)
{
_playerInstanceTimes.get(player.getObjectId()).remove(id); _playerInstanceTimes.get(player.getObjectId()).remove(id);
} }
}
catch (Exception e) catch (Exception e)
{ {
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not delete character instance reenter data: ", e); LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not delete character instance reenter data: ", e);