Fix NPE when player chats without a channel

OvercastNetwork · Dec 10, 2014 · 7bd5112 · 7bd5112
1 parent 025922e
commit 7bd5112
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/com/github/rmsy/channels/listener/ChatListener.java b/src/main/java/com/github/rmsy/channels/listener/ChatListener.java
@@ -1,5 +1,6 @@
 package com.github.rmsy.channels.listener;
 
+import com.github.rmsy.channels.Channel;
 import com.github.rmsy.channels.ChannelsPlugin;
 import com.google.common.base.Preconditions;
 import org.bukkit.entity.Player;
@@ -30,8 +31,11 @@ public ChatListener(final ChannelsPlugin plugin) {
     @SuppressWarnings("deprecation")
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPlayerChat(final PlayerChatEvent event) {
-        Preconditions.checkNotNull(event, "event").setCancelled(true);
         Player sender = event.getPlayer();
-        this.plugin.getPlayerManager().getMembershipChannel(sender).sendMessage(event.getMessage(), sender);
+        Channel channel = this.plugin.getPlayerManager().getMembershipChannel(sender);
+        if(channel != null) {
+            event.setCancelled(true);
+            channel.sendMessage(event.getMessage(), sender);
+        }
     }
 }