summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Ward <chris@chrisgward.com>2013-12-06 19:01:37 +1100
committerChris Ward <chris@chrisgward.com>2013-12-06 19:01:37 +1100
commitb836b3c0419d8454137acf48642b92c1c7eb3889 (patch)
tree669226ebcfb1d48d883026c39ad2a9ae557d3def
parent9550ef2a0df5ad4c1e6b7b7960894e1c5e46dfa6 (diff)
downloadEssentials-b836b3c0419d8454137acf48642b92c1c7eb3889.tar
Essentials-b836b3c0419d8454137acf48642b92c1c7eb3889.tar.gz
Essentials-b836b3c0419d8454137acf48642b92c1c7eb3889.tar.lz
Essentials-b836b3c0419d8454137acf48642b92c1c7eb3889.tar.xz
Essentials-b836b3c0419d8454137acf48642b92c1c7eb3889.zip
Who doesn't love a good ol' NPE
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
index e869b776c..4547ead88 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -257,7 +257,7 @@ public class EssentialsPlayerListener implements Listener
.replace("{USERNAME}", player.getName())
);
}
- else if (!(ess.getSettings().allowSilentJoinQuit() && user.isAuthorized("esentials.silentjoin")))
+ else if (!(ess.getSettings().allowSilentJoinQuit() && user.isAuthorized("esentials.silentjoin")) && message != null)
{
ess.getServer().broadcastMessage(message);
}