diff options
author | KHobbits <rob@khobbits.co.uk> | 2011-11-29 17:21:46 +0000 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2011-11-29 17:21:46 +0000 |
commit | 47e7d609644ef2844b3225b5d52251d04caf886e (patch) | |
tree | 3327e231cc18eec7a713d26b7fc74b58fb49ce52 | |
parent | 324814967f60007579064222c77f3537cd917354 (diff) | |
parent | 9f38179729bc1f4326a2c91df90faa81ae2406c0 (diff) | |
download | Essentials-47e7d609644ef2844b3225b5d52251d04caf886e.tar Essentials-47e7d609644ef2844b3225b5d52251d04caf886e.tar.gz Essentials-47e7d609644ef2844b3225b5d52251d04caf886e.tar.lz Essentials-47e7d609644ef2844b3225b5d52251d04caf886e.tar.xz Essentials-47e7d609644ef2844b3225b5d52251d04caf886e.zip |
Merge branch 'master' of github.com:essentials/Essentials
-rw-r--r-- | Essentials/src/com/earth2me/essentials/Essentials.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index f82aec91a..a83db16e3 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -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; } |