mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-02-15 05:33:40 +00:00
Catch NPE while login of new player
This commit is contained in:
parent
2e565f8881
commit
93883cfc12
2 changed files with 12 additions and 3 deletions
|
@ -561,9 +561,15 @@ public class Essentials extends JavaPlugin implements IEssentials
|
||||||
{
|
{
|
||||||
return (User)base;
|
return (User)base;
|
||||||
}
|
}
|
||||||
//Todo: catch this and deal with it?
|
try
|
||||||
|
{
|
||||||
return userMap.getUser(base.getName()).update(base);
|
return userMap.getUser(base.getName()).update(base);
|
||||||
}
|
}
|
||||||
|
catch (NullPointerException ex)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public User getOfflineUser(final String name)
|
public User getOfflineUser(final String name)
|
||||||
|
|
|
@ -303,7 +303,10 @@ public class EssentialsPlayerListener extends PlayerListener
|
||||||
{
|
{
|
||||||
return;
|
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);
|
user.setNPC(false);
|
||||||
|
|
||||||
final long currentTime = System.currentTimeMillis();
|
final long currentTime = System.currentTimeMillis();
|
||||||
|
|
Loading…
Reference in a new issue