summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2012-07-12 11:55:33 +0200
committersnowleo <schneeleo@gmail.com>2012-07-12 12:30:24 +0200
commita0b59fd58e1c9310c1de6b612d28b8eeefd651c8 (patch)
tree8156b1f544d1d26eb218384034b9863f3b011457
parent2670d641b198e98eb5e4de7d83770440b16d3eab (diff)
downloadEssentials-a0b59fd58e1c9310c1de6b612d28b8eeefd651c8.tar
Essentials-a0b59fd58e1c9310c1de6b612d28b8eeefd651c8.tar.gz
Essentials-a0b59fd58e1c9310c1de6b612d28b8eeefd651c8.tar.lz
Essentials-a0b59fd58e1c9310c1de6b612d28b8eeefd651c8.tar.xz
Essentials-a0b59fd58e1c9310c1de6b612d28b8eeefd651c8.zip
Another NPE fix for bots
-rw-r--r--Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java
index 386511225..a3d7ef322 100644
--- a/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java
+++ b/Essentials/src/net/ess3/utils/textreader/KeywordReplacer.java
@@ -43,8 +43,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.getData().getMails() == null ? 0 : user.getData().getMails().size());
world = user.getLocation() == null || user.getLocation().getWorld() == null ? "" : user.getLocation().getWorld().getName();