Catch NPE while login of new player

This commit is contained in:
snowleo 2011-08-11 13:43:04 +02:00
parent 2e565f8881
commit 93883cfc12
2 changed files with 12 additions and 3 deletions

View file

@ -561,8 +561,14 @@ public class Essentials extends JavaPlugin implements IEssentials
{
return (User)base;
}
//Todo: catch this and deal with it?
return userMap.getUser(base.getName()).update(base);
try
{
return userMap.getUser(base.getName()).update(base);
}
catch (NullPointerException ex)
{
return null;
}
}
@Override

View file

@ -303,7 +303,10 @@ public class EssentialsPlayerListener extends PlayerListener
{
return;
}
final User user = ess.getUser(event.getPlayer());
User user = ess.getUser(event.getPlayer());
if (user == null) {
user = new User(event.getPlayer(), ess);
}
user.setNPC(false);
final long currentTime = System.currentTimeMillis();