TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-10 22:35:35 +00:00
Code Issues Projects Releases Wiki Activity

[trunk] /msg /r Reply to the console. Add /r console command.

Browse source 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1129 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
snowleo 2011-04-05 15:57:54 +00:00
parent dbc653edb8
commit 57b5af7829
5 changed files with 89 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

60
Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
View file

@ -5,6 +5,8 @@ import org.bukkit.Server;
import com.earth2me.essentials.Essentials;
import org.bukkit.entity.Player;
import com.earth2me.essentials.User;
import com.earth2me.essentials.Console;
import com.earth2me.essentials.IReplyTo;
import org.bukkit.command.CommandSender;
public class Commandmsg extends EssentialsCommand
@ -20,40 +22,6 @@ public class Commandmsg extends EssentialsCommand
return new String[] { getName(), "m", "tell", "whisper" };
}
@Override
public void run(Server server, Essentials parent, User user, String commandLabel, String[] args) throws Exception
{
if (args.length < 2 || args[0].trim().length() == 0 || args[1].trim().length() == 0)
{
user.sendMessage("§cUsage: /" + commandLabel + " [player] [message]");
return;
}
StringBuilder message = new StringBuilder();
for (int i = 1; i < args.length; i++)
{
message.append(args[i]);
message.append(' ');
}
List<Player> matches = server.matchPlayer(args[0]);
if (matches.isEmpty())
{
user.sendMessage("§cThere are no players matching that name.");
return;
}
user.charge(this);
for (Player p : matches)
{
user.sendMessage("[Me -> " + p.getDisplayName() + "§f] " + message);
p.sendMessage("[" + user.getDisplayName() + " -> Me§f] " + message);
user.setReplyTo(User.get(p));
User.get(p).setReplyTo(user);
}
}
@Override
public void run(Server server, Essentials parent, CommandSender sender, String commandLabel, String[] args) throws Exception
{
@ -63,23 +31,35 @@ public class Commandmsg extends EssentialsCommand
return;
}
StringBuilder message = new StringBuilder();
for (int i = 1; i < args.length; i++)
String message = getFinalArg(args, 1);
IReplyTo replyTo = sender instanceof User?(User)sender:Console.getConsoleReplyTo();
String senderName = sender instanceof User?((User)sender).getDisplayName():Console.NAME;
if (args[0].equalsIgnoreCase(Console.NAME))
{
message.append(args[i]);
message.append(' ');
sender.sendMessage("[Me -> " + senderName + "§f] " + message);
CommandSender cs = Console.getCommandSender(server);
cs.sendMessage("[" + senderName + " -> Me§f] " + message);
replyTo.setReplyTo(cs);
Console.getConsoleReplyTo().setReplyTo(sender);
}
List<Player> matches = server.matchPlayer(args[0]);
if (matches.isEmpty())
{
sender.sendMessage("§cThere are no players matching that name.");
return;
}
charge(sender);
for (Player p : matches)
{
sender.sendMessage("[§2Me -> " + p.getDisplayName() + "§f] " + message);
p.sendMessage("[§2{Console} -> Me§f] " + message);
sender.sendMessage("[Me -> " + p.getDisplayName() + "§f] " + message);
p.sendMessage("[" + senderName + " -> Me§f] " + message);
replyTo.setReplyTo(User.get(p));
User.get(p).setReplyTo(sender);
}
}
}