summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIaccidentally <coryhuckaby@gmail.com>2013-07-13 12:41:31 -0400
committerIaccidentally <coryhuckaby@gmail.com>2013-07-13 12:41:31 -0400
commitc05ad0458f4f3145ea388b49b1135eb7432bd8be (patch)
tree20b47e3cb73411e343c9afb919600ebddc9d97c0
parentecd2484cb93ebb5677583e772e289ce4c314b468 (diff)
parent43c2c0233673f5ad33675a036bc6e693897e8f97 (diff)
downloadEssentials-c05ad0458f4f3145ea388b49b1135eb7432bd8be.tar
Essentials-c05ad0458f4f3145ea388b49b1135eb7432bd8be.tar.gz
Essentials-c05ad0458f4f3145ea388b49b1135eb7432bd8be.tar.lz
Essentials-c05ad0458f4f3145ea388b49b1135eb7432bd8be.tar.xz
Essentials-c05ad0458f4f3145ea388b49b1135eb7432bd8be.zip
Merge branch 'API' of https://github.com/essentials/Essentials into API
-rw-r--r--EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java2
-rw-r--r--EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java2
-rw-r--r--EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java3
3 files changed, 3 insertions, 4 deletions
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
index b5c011e55..b9b4fddbc 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/EssentialsXMPP.java
@@ -2,7 +2,7 @@ package com.earth2me.essentials.xmpp;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.IEssentials;
-import com.earth2me.essentials.IUser;
+import net.ess3.api.IUser;
import java.util.List;
import java.util.Locale;
import java.util.logging.Level;
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java
index 0635ca131..df329156d 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/IEssentialsXMPP.java
@@ -1,6 +1,6 @@
package com.earth2me.essentials.xmpp;
-import com.earth2me.essentials.IUser;
+import net.ess3.api.IUser;
import java.util.List;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
index 0c3b6e3b3..1f60ed11e 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
@@ -3,8 +3,7 @@ package com.earth2me.essentials.xmpp;
import com.earth2me.essentials.Console;
import com.earth2me.essentials.EssentialsConf;
import com.earth2me.essentials.IConf;
-import com.earth2me.essentials.IUser;
-import com.earth2me.essentials.utils.StringUtil;
+import net.ess3.api.IUser;
import com.earth2me.essentials.utils.FormatUtil;
import java.io.File;
import java.util.*;