mirror of
https://github.com/cnaude/PurpleIRC-spigot.git
synced 2024-09-30 07:27:28 +02:00
Fix /irc send
This commit is contained in:
parent
2fedc55ea5
commit
2795cf747a
@ -16,10 +16,8 @@
|
||||
*/
|
||||
package com.cnaude.purpleirc.Commands;
|
||||
|
||||
import com.cnaude.purpleirc.PurpleBot;
|
||||
import com.cnaude.purpleirc.PurpleIRC;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import com.cnaude.purpleirc.Utilities.BotsAndChannels;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
@ -51,45 +49,34 @@ public class Send implements IRCCommandInterface {
|
||||
*/
|
||||
@Override
|
||||
public void dispatch(CommandSender sender, String[] args) {
|
||||
if (args.length >= 2) {
|
||||
int msgIdx = 1;
|
||||
String channelName = null;
|
||||
List<PurpleBot> myBots = new ArrayList<>();
|
||||
if (plugin.ircBots.containsKey(args[1])) {
|
||||
myBots.add(plugin.ircBots.get(args[1]));
|
||||
msgIdx = 2;
|
||||
if (args.length >= 3) {
|
||||
if (plugin.ircBots.get(args[1]).isValidChannel(args[2])) {
|
||||
channelName = args[2];
|
||||
}
|
||||
}
|
||||
BotsAndChannels bac;
|
||||
int idx;
|
||||
|
||||
if (args.length >= 4) {
|
||||
bac = new BotsAndChannels(plugin, sender, args[1], args[2]);
|
||||
idx = 3;
|
||||
} else if (args.length >= 3) {
|
||||
bac = new BotsAndChannels(plugin, sender, args[1]);
|
||||
idx = 2;
|
||||
} else {
|
||||
myBots.addAll(plugin.ircBots.values());
|
||||
sender.sendMessage(fullUsage);
|
||||
return;
|
||||
}
|
||||
for (PurpleBot ircBot : myBots) {
|
||||
if (bac.bot.size() > 0 && bac.channel.size() > 0) {
|
||||
for (String botName : bac.bot) {
|
||||
for (String channelName : bac.channel) {
|
||||
String msg = "";
|
||||
for (int i = msgIdx; i < args.length; i++) {
|
||||
for (int i = idx; i < args.length; i++) {
|
||||
msg = msg + " " + args[i];
|
||||
}
|
||||
if (channelName == null) {
|
||||
for (String c : ircBot.botChannels) {
|
||||
if (sender instanceof Player) {
|
||||
ircBot.gameChat((Player) sender, c, msg.substring(1));
|
||||
plugin.ircBots.get(botName).gameChat((Player) sender, channelName, msg.substring(1));
|
||||
} else {
|
||||
ircBot.consoleChat(c, msg.substring(1));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (sender instanceof Player) {
|
||||
ircBot.gameChat((Player) sender, channelName, msg.substring(1));
|
||||
} else {
|
||||
ircBot.consoleChat(channelName, msg.substring(1));
|
||||
}
|
||||
plugin.ircBots.get(botName).consoleChat(channelName, msg.substring(1));
|
||||
}
|
||||
|
||||
}
|
||||
} else {
|
||||
sender.sendMessage(fullUsage);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user