summaryrefslogtreecommitdiffstats
path: root/Essentials
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2011-11-04 23:13:21 +0000
committerKHobbits <rob@khobbits.co.uk>2011-11-04 23:13:21 +0000
commit739d21e0fc584145be73b4856a8c74765965dce2 (patch)
treeb515b5654ded881db75b618ef5512ca1ba2ff0a2 /Essentials
parenta22d818ce9f0ad8c47e0b7ebbf920fcba42044f4 (diff)
downloadEssentials-739d21e0fc584145be73b4856a8c74765965dce2.tar
Essentials-739d21e0fc584145be73b4856a8c74765965dce2.tar.gz
Essentials-739d21e0fc584145be73b4856a8c74765965dce2.tar.lz
Essentials-739d21e0fc584145be73b4856a8c74765965dce2.tar.xz
Essentials-739d21e0fc584145be73b4856a8c74765965dce2.zip
Only pull/push data on valid player data.
Diffstat (limited to 'Essentials')
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/User.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
index 7a7ae4498..8ddc540ba 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -168,6 +168,7 @@ public class EssentialsPlayerListener extends PlayerListener
{
user.setDisplayNick(user.getNick());
}
+ user.setLastLoginAddress(user.getAddress().getAddress().getHostAddress());
user.updateActivity(false);
if (user.isAuthorized("essentials.sleepingignored"))
{
@@ -231,7 +232,6 @@ public class EssentialsPlayerListener extends PlayerListener
event.allow();
user.setLastLogin(System.currentTimeMillis());
- user.setLastLoginAddress(user.getAddress().getAddress().getHostAddress());
updateCompass(user);
}
diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java
index 973ffd401..2bbd32259 100644
--- a/Essentials/src/com/earth2me/essentials/User.java
+++ b/Essentials/src/com/earth2me/essentials/User.java
@@ -290,7 +290,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
@Override
public String getDisplayName()
{
- if (ess.getSettings().changeDisplayName())
+ if (!(base instanceof OfflinePlayer) && ess.getSettings().changeDisplayName())
{
setDisplayNick(getNick());
}