summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Schepp <schneeleo@gmail.com>2012-07-10 15:56:12 +0300
committerAlexander Schepp <schneeleo@gmail.com>2012-07-10 15:56:12 +0300
commit71e552c0d1e7dbb8002ac733788034c60aec45f4 (patch)
tree688bdc678d3b09764a24c0ef531262a271228860
parentdab13931ca6738dce9ef1bb0ae47de7ecc682f5d (diff)
downloadEssentials-71e552c0d1e7dbb8002ac733788034c60aec45f4.tar
Essentials-71e552c0d1e7dbb8002ac733788034c60aec45f4.tar.gz
Essentials-71e552c0d1e7dbb8002ac733788034c60aec45f4.tar.lz
Essentials-71e552c0d1e7dbb8002ac733788034c60aec45f4.tar.xz
Essentials-71e552c0d1e7dbb8002ac733788034c60aec45f4.zip
Another NPE fix for bots
-rw-r--r--Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java b/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java
index d8e590300..4c875098b 100644
--- a/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java
+++ b/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java
@@ -40,8 +40,8 @@ public class KeywordReplacer implements IText
user.setDisplayNick();
displayName = user.getDisplayName();
userName = user.getName();
- ipAddress = user.getAddress().getAddress().toString();
- address = user.getAddress().toString();
+ ipAddress = user.getAddress() == null || user.getAddress().getAddress() == null ? "" : user.getAddress().getAddress().toString();
+ address = user.getAddress() == null ? "" : user.getAddress().toString();
balance = Double.toString(user.getMoney());
mails = Integer.toString(user.getMails().size());
world = user.getLocation() == null || user.getLocation().getWorld() == null ? "" : user.getLocation().getWorld().getName();