summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-04-14 15:57:47 +0100
committerKHobbits <rob@khobbits.co.uk>2012-04-14 15:57:47 +0100
commit055603b09e9d620ea2c42262461e4f453d0a1689 (patch)
tree36aba292d21510aeff11ea1305f68e0765a63be7
parent45de85dae257e73dc9a041ffe6a02465692a5ce1 (diff)
downloadEssentials-055603b09e9d620ea2c42262461e4f453d0a1689.tar
Essentials-055603b09e9d620ea2c42262461e4f453d0a1689.tar.gz
Essentials-055603b09e9d620ea2c42262461e4f453d0a1689.tar.lz
Essentials-055603b09e9d620ea2c42262461e4f453d0a1689.tar.xz
Essentials-055603b09e9d620ea2c42262461e4f453d0a1689.zip
Fix null locations in /seen
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java1
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandseen.java4
2 files changed, 4 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
index 38243cf76..3e3f2fd91 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -116,6 +116,7 @@ public class EssentialsPlayerListener implements Listener
{
user.toggleGodModeEnabled();
}
+ user.setLastLocation();
user.updateActivity(false);
user.dispose();
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java
index 75f04da33..24f1f9c41 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandseen.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandseen.java
@@ -60,7 +60,9 @@ public class Commandseen extends EssentialsCommand
{
sender.sendMessage(_("whoisIPAddress", player.getLastLoginAddress()));
final Location loc = player.getLastLocation();
- sender.sendMessage(_("whoisLocation", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
+ if (loc != null) {
+ sender.sendMessage(_("whoisLocation", loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
+ }
}
}
}