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
commit2a227a64001ea6ef56a5a38487a9e5f92de049a0 (patch)
tree451114b31b97222c6447d04e9845c3f957b0152f
parent411a4cc7ee09ae19da93b45cd9cd51c83d98900f (diff)
downloadEssentials-2a227a64001ea6ef56a5a38487a9e5f92de049a0.tar
Essentials-2a227a64001ea6ef56a5a38487a9e5f92de049a0.tar.gz
Essentials-2a227a64001ea6ef56a5a38487a9e5f92de049a0.tar.lz
Essentials-2a227a64001ea6ef56a5a38487a9e5f92de049a0.tar.xz
Essentials-2a227a64001ea6ef56a5a38487a9e5f92de049a0.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;