summaryrefslogtreecommitdiffstats
path: root/EssentialsChat/src/com/earth2me/essentials
diff options
context:
space:
mode:
authorGunfighterJ <joseph.jenniges@gmail.com>2013-01-27 10:44:13 -0600
committerGunfighterJ <joseph.jenniges@gmail.com>2013-01-27 10:44:13 -0600
commit2a7f3c65257e20414335e4340ddc05843007a3a9 (patch)
tree80162425e303911ad802095a5caf20e6effdbb70 /EssentialsChat/src/com/earth2me/essentials
parent95e630de921ccf10432cf6e0974eb8927772f612 (diff)
parentc65353350fe1e05ed737a5598b53b8099c0deac1 (diff)
downloadEssentials-2a7f3c65257e20414335e4340ddc05843007a3a9.tar
Essentials-2a7f3c65257e20414335e4340ddc05843007a3a9.tar.gz
Essentials-2a7f3c65257e20414335e4340ddc05843007a3a9.tar.lz
Essentials-2a7f3c65257e20414335e4340ddc05843007a3a9.tar.xz
Essentials-2a7f3c65257e20414335e4340ddc05843007a3a9.zip
Merge branch '2.9' of https://github.com/essentials/Essentials into 2.9
Diffstat (limited to 'EssentialsChat/src/com/earth2me/essentials')
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java
index db728bd09..9af8cf593 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerHighest.java
@@ -23,7 +23,7 @@ public class EssentialsChatPlayerListenerHighest extends EssentialsChatPlayer
public void onPlayerChat(final AsyncPlayerChatEvent event)
{
final ChatStore chatStore = delChatStore(event);
- if (isAborted(event))
+ if (isAborted(event) || chatStore == null)
{
return;
}