summaryrefslogtreecommitdiffstats
path: root/EssentialsXMPP
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-07-07 12:11:57 +0100
committerKHobbits <rob@khobbits.co.uk>2013-07-07 12:38:01 +0100
commit3d29248ace7758d55a39d4247597abf0944b5145 (patch)
tree689b079eff6eedd166e1c8b31e5c1348f29c9a29 /EssentialsXMPP
parent3f5e2ad85ab95f741700a8126d5f917a9cc0014c (diff)
downloadEssentials-3d29248ace7758d55a39d4247597abf0944b5145.tar
Essentials-3d29248ace7758d55a39d4247597abf0944b5145.tar.gz
Essentials-3d29248ace7758d55a39d4247597abf0944b5145.tar.lz
Essentials-3d29248ace7758d55a39d4247597abf0944b5145.tar.xz
Essentials-3d29248ace7758d55a39d4247597abf0944b5145.zip
Misc cleanup
Diffstat (limited to 'EssentialsXMPP')
-rw-r--r--EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java2
-rw-r--r--EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java
index e0bf9827c..c4f66097e 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java
@@ -21,7 +21,7 @@ public class Commandsetxmpp extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
- EssentialsXMPP.getInstance().setAddress(user, args[0]);
+ EssentialsXMPP.getInstance().setAddress(user.getBase(), args[0]);
user.sendMessage("XMPP address set to " + args[0]);
}
}
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()));
}
}
}