summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2013-05-05 11:08:49 +0300
committersnowleo <schneeleo@gmail.com>2013-05-05 11:08:49 +0300
commitaaebb6143e333eaae97568a2fb724a52a58c7011 (patch)
treec68a36bd2c0fd4c254debf26e607866a2d0a99b7
parentc4ac744d35a33961b7169b4f65cdbb6a013947bc (diff)
downloadEssentials-aaebb6143e333eaae97568a2fb724a52a58c7011.tar
Essentials-aaebb6143e333eaae97568a2fb724a52a58c7011.tar.gz
Essentials-aaebb6143e333eaae97568a2fb724a52a58c7011.tar.lz
Essentials-aaebb6143e333eaae97568a2fb724a52a58c7011.tar.xz
Essentials-aaebb6143e333eaae97568a2fb724a52a58c7011.zip
fix NPE in teleport code
-rw-r--r--Essentials/src/com/earth2me/essentials/User.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java
index 68afe4a68..876f8933c 100644
--- a/Essentials/src/com/earth2me/essentials/User.java
+++ b/Essentials/src/com/earth2me/essentials/User.java
@@ -264,7 +264,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
public void requestTeleport(final User player, final boolean here)
{
teleportRequestTime = System.currentTimeMillis();
- teleportRequester = player.getName();
+ teleportRequester = player == null ? null : player.getName();
teleportRequestHere = here;
}