diff options
| author | KHobbits <rob@khobbits.co.uk> | 2011-07-07 04:14:50 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2011-07-07 04:14:50 +0100 |
| commit | 34568ea8fc2249cc3edee9a259122b0b4316d478 (patch) | |
| tree | 051f24907e9d64eb2333797b1b01dba8a661f0e4 /EssentialsXMPP | |
| parent | 209a9a2f958a583b3d50dd7a60c62a3df17a8b70 (diff) | |
| parent | 56a2398d9bf7bb946066006781b10360ec1997b4 (diff) | |
| download | Essentials-34568ea8fc2249cc3edee9a259122b0b4316d478.tar Essentials-34568ea8fc2249cc3edee9a259122b0b4316d478.tar.gz Essentials-34568ea8fc2249cc3edee9a259122b0b4316d478.tar.lz Essentials-34568ea8fc2249cc3edee9a259122b0b4316d478.tar.xz Essentials-34568ea8fc2249cc3edee9a259122b0b4316d478.zip | |
Merge branch 'master' of github.com:khobbits/Essentials
Conflicts:
Essentials/src/com/earth2me/essentials/commands/Commandhelp.java
Diffstat (limited to 'EssentialsXMPP')
| -rw-r--r-- | EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java | 2 | ||||
| -rw-r--r-- | EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java index a2ee7bed1..27988f11a 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java @@ -65,7 +65,7 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP @Override public boolean onCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args) { - return Essentials.getStatic().onCommandEssentials(sender, command, commandLabel, args, EssentialsXMPP.class.getClassLoader(), "com.earth2me.essentials.xmpp.Command"); + return Essentials.getStatic().onCommandEssentials(sender, command, commandLabel, args, EssentialsXMPP.class.getClassLoader(), "com.earth2me.essentials.xmpp.Command", "essentials."); } @Override diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java index 537a32a5e..fb0145ee4 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java @@ -94,7 +94,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager private void connect() { final String server = config.getString("xmpp.server"); - if (server == null) + if (server == null || server.equals("example.com")) { LOGGER.log(Level.WARNING, "config broken for xmpp"); return; |