diff options
| author | ementalo <ementalodev@gmx.co.uk> | 2012-10-09 00:38:55 +0100 |
|---|---|---|
| committer | ementalo <ementalodev@gmx.co.uk> | 2012-10-09 00:38:55 +0100 |
| commit | 8412b6682f0423b509b97784002552e172fbe49b (patch) | |
| tree | 93dd0b1cec0fdcf9155a852eea8def8aa1fd3959 | |
| parent | 4d1cdaa7f0afd0d674bb1c9cce9623bea9eaa078 (diff) | |
| download | Essentials-8412b6682f0423b509b97784002552e172fbe49b.tar Essentials-8412b6682f0423b509b97784002552e172fbe49b.tar.gz Essentials-8412b6682f0423b509b97784002552e172fbe49b.tar.lz Essentials-8412b6682f0423b509b97784002552e172fbe49b.tar.xz Essentials-8412b6682f0423b509b97784002552e172fbe49b.zip | |
Null checks on join / quit variables
| -rw-r--r-- | Essentials/src/net/ess3/listener/EssentialsPlayerListener.java | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java index 6a0fa57cf..e974f2e14 100644 --- a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java @@ -117,10 +117,19 @@ public class EssentialsPlayerListener implements Listener @EventHandler(priority = EventPriority.MONITOR) public void onPlayerQuit(final PlayerQuitEvent event) { - final IText itOutput = new KeywordReplacer(new SimpleTextInput(ess.getSettings().getData().getGeneral().getLeaveMessage()), event.getPlayer(), ess); - final SimpleTextPager stPager = new SimpleTextPager(itOutput); - event.setQuitMessage(FormatUtil.replaceFormat(stPager.getString(0))); - + final String quitMessage = ess.getSettings().getData().getGeneral().getLeaveMessage(); + if (quitMessage != null) + { + final IText itOutput = new KeywordReplacer(new SimpleTextInput(quitMessage), event.getPlayer(), ess); + final SimpleTextPager stPager = new SimpleTextPager(itOutput); + event.setQuitMessage(FormatUtil.replaceFormat(stPager.getString(0))); + } + else + { + event.setQuitMessage(quitMessage); + } + + final IUser user = ess.getUserMap().getUser(event.getPlayer()); final ISettings settings = ess.getSettings(); @@ -151,10 +160,18 @@ public class EssentialsPlayerListener implements Listener ess.getBackup().startTask(); - final IText itOutput = new KeywordReplacer(new SimpleTextInput(ess.getSettings().getData().getGeneral().getJoinMessage()), event.getPlayer(), ess); - final SimpleTextPager stPager = new SimpleTextPager(itOutput); - event.setJoinMessage(FormatUtil.replaceFormat(stPager.getString(0))); - + final String joinMessage = ess.getSettings().getData().getGeneral().getJoinMessage(); + if (joinMessage != null) + { + final IText itOutput = new KeywordReplacer(new SimpleTextInput(joinMessage), event.getPlayer(), ess); + final SimpleTextPager stPager = new SimpleTextPager(itOutput); + event.setJoinMessage(FormatUtil.replaceFormat(stPager.getString(0))); + } + else + { + event.setJoinMessage(joinMessage); + } + final IUser user = ess.getUserMap().getUser(event.getPlayer()); user.updateDisplayName(); |