diff options
author | okamosy <okamosy@gmail.com> | 2011-09-10 09:39:15 +0100 |
---|---|---|
committer | okamosy <okamosy@gmail.com> | 2011-09-10 09:39:15 +0100 |
commit | 8d6e3e7c18f6b292440db737f48337e093ea5073 (patch) | |
tree | 28e9239fc02f764f6146322a3fa51764f4251fa8 /EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java | |
parent | 8249a961f6c9a2fe1d550b3d5d32f3a21f2ea378 (diff) | |
parent | 0b057d8e29a7f91e1ab27d99d9c9d4aaa53bdebf (diff) | |
download | Essentials-8d6e3e7c18f6b292440db737f48337e093ea5073.tar Essentials-8d6e3e7c18f6b292440db737f48337e093ea5073.tar.gz Essentials-8d6e3e7c18f6b292440db737f48337e093ea5073.tar.lz Essentials-8d6e3e7c18f6b292440db737f48337e093ea5073.tar.xz Essentials-8d6e3e7c18f6b292440db737f48337e093ea5073.zip |
Merge branch 'master' of github.com:essentials/Essentials
Diffstat (limited to 'EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java')
-rw-r--r-- | EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java index 8ab62cd4d..34f862627 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java @@ -1,6 +1,7 @@ package com.earth2me.essentials.xmpp; import com.earth2me.essentials.IEssentials; +import com.earth2me.essentials.IUser; import com.earth2me.essentials.Util; import java.util.List; import java.util.logging.Level; @@ -83,9 +84,10 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP } @Override - public String getUserByAddress(final String address) + public IUser getUserByAddress(final String address) { - return instance.users.getUserByAddress(address); + String username = instance.users.getUserByAddress(address); + return username == null ? null : ess.getUser(username); } @Override @@ -122,9 +124,9 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP } @Override - public void broadcastMessage(final String name, final String message) + public void broadcastMessage(final IUser sender, final String message) { - ess.broadcastMessage(name, message); + ess.broadcastMessage(sender, message); try { for (String address : getSpyUsers()) |