Merge branch 'master' of github.com:essentials/Essentials

This commit is contained in:
KHobbits 2011-11-29 17:21:46 +00:00
commit e5435f24db

View File

@ -438,11 +438,13 @@ public class Essentials extends JavaPlugin implements IEssentials
{
return (User)base;
}
User user = userMap.getUser(base.getName()).update(base);
User user = userMap.getUser(base.getName());
if (user == null)
{
user = new User(base, this);
} else {
user.update(base);
}
return user;
}