From 60067964befac36651a9f5f232652b1daf794c7b Mon Sep 17 00:00:00 2001 From: snowleo Date: Tue, 29 Nov 2011 17:39:13 +0100 Subject: Fix NPE in getUser() --- Essentials/src/com/earth2me/essentials/Essentials.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; } -- cgit v1.2.3