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 | e5435f24db17b81f020b681d4229b3819cff3e89 (patch) | |
| tree | ba46ee30b43ce452a34c75d4f710972947f4b561 | |
| parent | af7eae6201702950268758a2b993c4bdc4f7b45c (diff) | |
| parent | 60067964befac36651a9f5f232652b1daf794c7b (diff) | |
| download | Essentials-e5435f24db17b81f020b681d4229b3819cff3e89.tar Essentials-e5435f24db17b81f020b681d4229b3819cff3e89.tar.gz Essentials-e5435f24db17b81f020b681d4229b3819cff3e89.tar.lz Essentials-e5435f24db17b81f020b681d4229b3819cff3e89.tar.xz Essentials-e5435f24db17b81f020b681d4229b3819cff3e89.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; } |