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
commit0be9986dfbba5a28e18363a80c73e555d935721a (patch)
treec66244539e9bfe345794689824e6afc4c41de67a /EssentialsXMPP
parent89e71ae34e0681b1ecd2122df9ad9c994d97662e (diff)
downloadEssentials-0be9986dfbba5a28e18363a80c73e555d935721a.tar
Essentials-0be9986dfbba5a28e18363a80c73e555d935721a.tar.gz
Essentials-0be9986dfbba5a28e18363a80c73e555d935721a.tar.lz
Essentials-0be9986dfbba5a28e18363a80c73e555d935721a.tar.xz
Essentials-0be9986dfbba5a28e18363a80c73e555d935721a.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()));
}
}
}