minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-31 18:21:51 +02:00
Code Issues Releases Wiki Activity

Null checks on join / quit variables

Browse Source
This commit is contained in:
ementalo
2012-10-09 00:38:55 +01:00
parent 4d1cdaa7f0
commit 8412b6682f
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Essentials/src/net/ess3/listener/EssentialsPlayerListener.java
View File

@@ -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();