summaryrefslogtreecommitdiffstats
path: root/EssentialsXMPP/src
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
commit35e0cab96a677b04323b88b4dde8c09711ef5933 (patch)
treefdaec450959b8ed628499675582f222220765d1e /EssentialsXMPP/src
parent25b6c607e2554941d5c7b030c77df3afbe2fa720 (diff)
downloadEssentials-35e0cab96a677b04323b88b4dde8c09711ef5933.tar
Essentials-35e0cab96a677b04323b88b4dde8c09711ef5933.tar.gz
Essentials-35e0cab96a677b04323b88b4dde8c09711ef5933.tar.lz
Essentials-35e0cab96a677b04323b88b4dde8c09711ef5933.tar.xz
Essentials-35e0cab96a677b04323b88b4dde8c09711ef5933.zip
Misc cleanup
Diffstat (limited to 'EssentialsXMPP/src')
-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()));
}
}
}