summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Schepp <schneeleo@gmail.com>2012-10-21 23:17:08 +0300
committerAlexander Schepp <schneeleo@gmail.com>2012-10-21 23:17:08 +0300
commit86124b2705605a986e1bd1664599f65512e6e049 (patch)
treede4ddfa18ca5a217160337a4635f0ebbc4cc3700
parent99cefb2d7444506fbd3f5ca653daf5743e7cc52b (diff)
downloadEssentials-86124b2705605a986e1bd1664599f65512e6e049.tar
Essentials-86124b2705605a986e1bd1664599f65512e6e049.tar.gz
Essentials-86124b2705605a986e1bd1664599f65512e6e049.tar.lz
Essentials-86124b2705605a986e1bd1664599f65512e6e049.tar.xz
Essentials-86124b2705605a986e1bd1664599f65512e6e049.zip
Fix NPE in UserData on login
if no address is available
-rw-r--r--Essentials/src/com/earth2me/essentials/UserData.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/UserData.java b/Essentials/src/com/earth2me/essentials/UserData.java
index 76bac71b3..3de5c1e48 100644
--- a/Essentials/src/com/earth2me/essentials/UserData.java
+++ b/Essentials/src/com/earth2me/essentials/UserData.java
@@ -635,7 +635,10 @@ public abstract class UserData extends PlayerExtension implements IConf
public void setLastLogin(long time)
{
_setLastLogin(time);
- _setLastLoginAddress(base.getAddress().getAddress().getHostAddress());
+ if (base.getAddress() != null && base.getAddress().getAddress() != null)
+ {
+ _setLastLoginAddress(base.getAddress().getAddress().getHostAddress());
+ }
config.save();
}
private long lastLogout;