Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-10-06 03:27:50 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
KHobbits 2011-11-29 17:21:46 +00:00
commit e5435f24db
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Essentials/src/com/earth2me/essentials/Essentials.java
View File

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