ChromaGaming/Chroma-Chat
1
0
Fork 0
Code Issues 15 Pull requests 1 Projects Releases 8 Packages Wiki Activity

Added support for ch IDs field

Browse source
This commit is contained in:
Norbi Peti 2018-05-16 22:56:59 +02:00
parent 0c768b95e8
commit 6d3d24ecbf
No known key found for this signature in database
GPG key ID: DBA4C4549A927E56
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/buttondevteam/chat/listener/PlayerListener.java
View file

@ -30,10 +30,8 @@ import org.bukkit.help.HelpTopic;
import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import java.util.ArrayList; import java.util.*;
import java.util.Random; import java.util.function.BiPredicate;
import java.util.Timer;
import java.util.TimerTask;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Supplier; import java.util.function.Supplier;
@ -75,13 +73,14 @@ public class PlayerListener implements Listener {
else else
mp = null; mp = null;
String cmd = ""; String cmd = "";
final BiPredicate<Channel, String> checkchid = (chan, cmd1) -> cmd1.equalsIgnoreCase(chan.ID) || (chan.IDs != null && Arrays.stream(chan.IDs).anyMatch(cmd1::equalsIgnoreCase));
if (index == -1) { // Only the command is run if (index == -1) { // Only the command is run
if (!(sender instanceof Player || sender instanceof ConsoleCommandSender)) if (!(sender instanceof Player || sender instanceof ConsoleCommandSender))
return false; return false;
// ^^ We can only store player or console channels - Directly sending to channels would still work if they had an event // ^^ We can only store player or console channels - Directly sending to channels would still work if they had an event
cmd = sender instanceof ConsoleCommandSender ? message : message.substring(1); cmd = sender instanceof ConsoleCommandSender ? message : message.substring(1);
for (Channel channel : Channel.getChannels()) { for (Channel channel : Channel.getChannels()) {
if (cmd.equalsIgnoreCase(channel.ID)) { if (checkchid.test(channel, cmd)) {
Supplier<Channel> getch = () -> sender instanceof Player ? mp.CurrentChannel : ConsoleChannel; Supplier<Channel> getch = () -> sender instanceof Player ? mp.CurrentChannel : ConsoleChannel;
Consumer<Channel> setch = ch -> { Consumer<Channel> setch = ch -> {
if (sender instanceof Player) if (sender instanceof Player)
@ -130,7 +129,7 @@ public class PlayerListener implements Listener {
} }
} else } else
for (Channel channel : Channel.getChannels()) { for (Channel channel : Channel.getChannels()) {
if (cmd.equalsIgnoreCase(channel.ID)) { if (checkchid.test(channel, cmd)) { //Apparently method references don't require final variables
TBMCChatAPI.SendChatMessage(channel, sender, message.substring(index + 1)); TBMCChatAPI.SendChatMessage(channel, sender, message.substring(index + 1));
return true; return true;
} }