diff options
| author | ementalo <ementalodev@gmx.co.uk> | 2012-06-25 23:38:20 +0100 |
|---|---|---|
| committer | ementalo <ementalodev@gmx.co.uk> | 2012-06-25 23:38:20 +0100 |
| commit | 49465358f9d3be370c4bd24a9fa4ec2fa53fefd0 (patch) | |
| tree | d3bb06d907bb1270367c477d57429bc8d8e645c9 | |
| parent | 6488882e1afc883281185ea930f3bb01d24f0875 (diff) | |
| download | Essentials-49465358f9d3be370c4bd24a9fa4ec2fa53fefd0.tar Essentials-49465358f9d3be370c4bd24a9fa4ec2fa53fefd0.tar.gz Essentials-49465358f9d3be370c4bd24a9fa4ec2fa53fefd0.tar.lz Essentials-49465358f9d3be370c4bd24a9fa4ec2fa53fefd0.tar.xz Essentials-49465358f9d3be370c4bd24a9fa4ec2fa53fefd0.zip | |
snowleo Prevent NPEs in KeywordReplacer
2c6a81a916419c76b13d2b761c5bb00eee3f9307
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/utils/textreader/KeywordReplacer.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/utils/textreader/KeywordReplacer.java b/Essentials/src/com/earth2me/essentials/utils/textreader/KeywordReplacer.java index c38c39167..b9c67fa77 100644 --- a/Essentials/src/com/earth2me/essentials/utils/textreader/KeywordReplacer.java +++ b/Essentials/src/com/earth2me/essentials/utils/textreader/KeywordReplacer.java @@ -47,10 +47,10 @@ public class KeywordReplacer implements IText address = user.getAddress().toString(); balance = Double.toString(user.getMoney()); mails = Integer.toString(user.getData().getMails() == null ? 0 : user.getData().getMails().size()); - world = user.getLocation().getWorld().getName(); - worldTime12 = DescParseTickFormat.format12(user.getWorld().getTime()); - worldTime24 = DescParseTickFormat.format24(user.getWorld().getTime()); - worldDate = DateFormat.getDateInstance(DateFormat.MEDIUM, ess.getI18n().getCurrentLocale()).format(DescParseTickFormat.ticksToDate(user.getWorld().getFullTime())); + world = user.getLocation() == null || user.getLocation().getWorld() == null ? "" : user.getLocation().getWorld().getName(); + worldTime12 = DescParseTickFormat.format12(user.getWorld() == null ? 0 : user.getWorld().getTime()); + worldTime24 = DescParseTickFormat.format24(user.getWorld() == null ? 0 : user.getWorld().getTime()); + worldDate = DateFormat.getDateInstance(DateFormat.MEDIUM, ess.getI18n().getCurrentLocale()).format(DescParseTickFormat.ticksToDate(user.getWorld() == null ? 0 : user.getWorld().getFullTime())); } else { |