TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-05-28 10:07:33 +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@1134 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
snowleo 2011-04-05 18:14:18 +00:00
parent 2442285d7b
commit 4b8ffabfb8
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,8 +33,8 @@ public class Commandmsg extends EssentialsCommand
String message = getFinalArg(args, 1);
IReplyTo replyTo = sender instanceof User?(User)sender:Console.getConsoleReplyTo();
String senderName = sender instanceof User?((User)sender).getDisplayName():Console.NAME;
IReplyTo replyTo = sender instanceof Player?User.get((Player)sender):Console.getConsoleReplyTo();
String senderName = sender instanceof Player?((Player)sender).getDisplayName():Console.NAME;
if (args[0].equalsIgnoreCase(Console.NAME))
{

16
Essentials/src/com/earth2me/essentials/commands/Commandr.java
View file

@ -25,10 +25,10 @@ public class Commandr extends EssentialsCommand
}
String message = getFinalArg(args, 0);
IReplyTo replyTo = sender instanceof User?(User)sender:Console.getConsoleReplyTo();
String senderName = sender instanceof User?((User)sender).getDisplayName():Console.NAME;
IReplyTo replyTo = sender instanceof Player?User.get((Player)sender):Console.getConsoleReplyTo();
String senderName = sender instanceof Player?((Player)sender).getDisplayName():Console.NAME;
CommandSender target = replyTo.getReplyTo();
String targetName = target instanceof User?((User)target).getDisplayName():Console.NAME;
String targetName = target instanceof Player?((Player)target).getDisplayName():Console.NAME;
if (target == null)
{
@ -39,10 +39,12 @@ public class Commandr extends EssentialsCommand
sender.sendMessage("[Me -> " + targetName + "] " + message);
target.sendMessage("[" + senderName + " -> Me] " + message);
replyTo.setReplyTo(target);
if (target instanceof Player) {
User.get((Player)target).setReplyTo(sender);
} else {
Console.getConsoleReplyTo().setReplyTo(sender);
if (target != sender) {
if (target instanceof Player) {
User.get((Player)target).setReplyTo(sender);
} else {
Console.getConsoleReplyTo().setReplyTo(sender);
}
}
}
}