TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-19 06:58:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:essentials/Essentials

Browse source
This commit is contained in:
ementalo 2011-07-07 21:05:46 +01:00
commit dab37c7b5b
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java
View file

@ -33,7 +33,9 @@ public class Commandxmpp extends EssentialsCommand
final String message = getFinalArg(args, 1); final String message = getFinalArg(args, 1);
final String senderName = sender instanceof Player ? ess.getUser(sender).getDisplayName() : Console.NAME; final String senderName = sender instanceof Player ? ess.getUser(sender).getDisplayName() : Console.NAME;
sender.sendMessage("[" + senderName + ">" + address + "] " + message); sender.sendMessage("[" + senderName + ">" + address + "] " + message);
EssentialsXMPP.getInstance().sendMessage(address, "[" + senderName + "] " + message); if (!EssentialsXMPP.getInstance().sendMessage(address, "[" + senderName + "] " + message)) {
sender.sendMessage("§cError sending message.");
}
} }
} }
} }

8
EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
View file

@ -103,15 +103,15 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP
} }
@Override @Override
public void sendMessage(final Player user, final String message) public boolean sendMessage(final Player user, final String message)
{ {
instance.xmpp.sendMessage(instance.users.getAddress(user.getName()), message); return instance.xmpp.sendMessage(instance.users.getAddress(user.getName()), message);
} }
@Override @Override
public void sendMessage(final String address, final String message) public boolean sendMessage(final String address, final String message)
{ {
instance.xmpp.sendMessage(address, message); return instance.xmpp.sendMessage(address, message);
} }
@Override @Override

4
EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java
View file

@ -15,9 +15,9 @@ public interface IEssentialsXMPP
String getUserByAddress(final String address); String getUserByAddress(final String address);
void sendMessage(final Player user, final String message); boolean sendMessage(final Player user, final String message);
void sendMessage(final String address, final String message); boolean sendMessage(final String address, final String message);
void setAddress(final Player user, final String address); void setAddress(final Player user, final String address);