diff options
| author | snowleo <schneeleo@gmail.com> | 2011-11-29 17:39:13 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2011-11-29 17:39:22 +0100 |
| commit | 9f38179729bc1f4326a2c91df90faa81ae2406c0 (patch) | |
| tree | 3be67d1c3dca696e6443219914c7d8397625e81b | |
| parent | a5c8676ab99a76e8ba1fc783ed1afcf692955d87 (diff) | |
| download | Essentials-9f38179729bc1f4326a2c91df90faa81ae2406c0.tar Essentials-9f38179729bc1f4326a2c91df90faa81ae2406c0.tar.gz Essentials-9f38179729bc1f4326a2c91df90faa81ae2406c0.tar.lz Essentials-9f38179729bc1f4326a2c91df90faa81ae2406c0.tar.xz Essentials-9f38179729bc1f4326a2c91df90faa81ae2406c0.zip | |
Fix NPE in getUser()
| -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 15419b014..e33e70f18 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -437,11 +437,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; } |