1
0
mirror of https://e.coding.net/circlecloud/Residence.git synced 2025-11-24 21:46:16 +00:00

fix ChatChannel null...

Signed-off-by: j502647092 <jtb1@163.com>
This commit is contained in:
j502647092
2015-09-24 22:24:53 +08:00
parent 4d58efec35
commit 75f7cb4be8

View File

@@ -17,9 +17,10 @@ import com.bekvon.bukkit.residence.Residence;
public class ChatManager { public class ChatManager {
protected Map<String, ChatChannel> channelmap; protected Map<String, ChatChannel> channelmap;
protected Residence plugin; protected final Residence plugin;
public ChatManager(final Residence plugin) { public ChatManager(final Residence plugin) {
this.plugin = plugin;
channelmap = new HashMap<String, ChatChannel>(); channelmap = new HashMap<String, ChatChannel>();
} }
@@ -28,27 +29,22 @@ public class ChatManager {
} }
public ChatChannel getPlayerChannel(final String player) { public ChatChannel getPlayerChannel(final String player) {
for (final ChatChannel chan : channelmap.values()) { for (final ChatChannel chan : channelmap.values())
if (chan.hasMember(player)) { if (chan.hasMember(player))
return chan; return chan;
}
}
return null; return null;
} }
public void removeFromChannel(final String player) { public void removeFromChannel(final String player) {
for (final ChatChannel chan : channelmap.values()) { for (final ChatChannel chan : channelmap.values())
if (chan.hasMember(player)) { if (chan.hasMember(player))
chan.leave(player); chan.leave(player);
}
}
} }
public void setChannel(final String player, final String channel) { public void setChannel(final String player, final String channel) {
this.removeFromChannel(player); this.removeFromChannel(player);
if (!channelmap.containsKey(channel)) { if (!channelmap.containsKey(channel))
channelmap.put(channel, new ChatChannel(plugin, channel)); channelmap.put(channel, new ChatChannel(plugin, channel));
}
channelmap.get(channel).join(player); channelmap.get(channel).join(player);
} }