From 75f7cb4be827d1c0e6faf938b982cd7d6714f102 Mon Sep 17 00:00:00 2001 From: j502647092 Date: Thu, 24 Sep 2015 22:24:53 +0800 Subject: [PATCH] fix ChatChannel null... Signed-off-by: j502647092 --- .../bukkit/residence/chat/ChatManager.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/bekvon/bukkit/residence/chat/ChatManager.java b/src/main/java/com/bekvon/bukkit/residence/chat/ChatManager.java index b0b8e61..081cd52 100644 --- a/src/main/java/com/bekvon/bukkit/residence/chat/ChatManager.java +++ b/src/main/java/com/bekvon/bukkit/residence/chat/ChatManager.java @@ -17,9 +17,10 @@ import com.bekvon.bukkit.residence.Residence; public class ChatManager { protected Map channelmap; - protected Residence plugin; + protected final Residence plugin; public ChatManager(final Residence plugin) { + this.plugin = plugin; channelmap = new HashMap(); } @@ -28,27 +29,22 @@ public class ChatManager { } public ChatChannel getPlayerChannel(final String player) { - for (final ChatChannel chan : channelmap.values()) { - if (chan.hasMember(player)) { + for (final ChatChannel chan : channelmap.values()) + if (chan.hasMember(player)) return chan; - } - } return null; } public void removeFromChannel(final String player) { - for (final ChatChannel chan : channelmap.values()) { - if (chan.hasMember(player)) { + for (final ChatChannel chan : channelmap.values()) + if (chan.hasMember(player)) chan.leave(player); - } - } } public void setChannel(final String player, final String channel) { this.removeFromChannel(player); - if (!channelmap.containsKey(channel)) { + if (!channelmap.containsKey(channel)) channelmap.put(channel, new ChatChannel(plugin, channel)); - } channelmap.get(channel).join(player); }