summaryrefslogtreecommitdiffstats
path: root/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
diff options
context:
space:
mode:
authorIaccidentally <coryhuckaby@gmail.com>2013-07-13 10:38:28 -0400
committerIaccidentally <coryhuckaby@gmail.com>2013-07-13 10:38:28 -0400
commit4015b3056d807d680fb0a90c5b5a63edc1bea442 (patch)
tree94a172f922581da041e45efa00c649deef8e2a26 /EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
parentaf9134c83a526559f727b19aa1d80a9ad8d78270 (diff)
parent60682e1ab57ce08d9a1bb1ba28dbcc431fafdf05 (diff)
downloadEssentials-4015b3056d807d680fb0a90c5b5a63edc1bea442.tar
Essentials-4015b3056d807d680fb0a90c5b5a63edc1bea442.tar.gz
Essentials-4015b3056d807d680fb0a90c5b5a63edc1bea442.tar.lz
Essentials-4015b3056d807d680fb0a90c5b5a63edc1bea442.tar.xz
Essentials-4015b3056d807d680fb0a90c5b5a63edc1bea442.zip
Merge branch '2.x' of https://github.com/essentials/Essentials into API
Diffstat (limited to 'EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java')
-rw-r--r--EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
index 21798521e..0c3b6e3b3 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
@@ -95,7 +95,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager
break;
default:
final IUser sender = parent.getUserByAddress(StringUtils.parseBareAddress(chat.getParticipant()));
- parent.broadcastMessage(sender, "=" + sender.getDisplayName() + ": " + message, StringUtils.parseBareAddress(chat.getParticipant()));
+ parent.broadcastMessage(sender, "=" + sender.getBase().getDisplayName() + ": " + message, StringUtils.parseBareAddress(chat.getParticipant()));
}
}
}