diff options
author | Iaccidentally <coryhuckaby@gmail.com> | 2013-07-13 12:41:31 -0400 |
---|---|---|
committer | Iaccidentally <coryhuckaby@gmail.com> | 2013-07-13 12:41:31 -0400 |
commit | f558a57824de77aed4574c13cc45a89cf97e9f63 (patch) | |
tree | 75ca9d12cfff6fa213d8f7daade95daaa1add159 | |
parent | acca5bd4d80897e14c90a1c552de5b10caab6f8e (diff) | |
parent | 0468f61b164df3ee43f879a7636f7bbc23e76c68 (diff) | |
download | Essentials-f558a57824de77aed4574c13cc45a89cf97e9f63.tar Essentials-f558a57824de77aed4574c13cc45a89cf97e9f63.tar.gz Essentials-f558a57824de77aed4574c13cc45a89cf97e9f63.tar.lz Essentials-f558a57824de77aed4574c13cc45a89cf97e9f63.tar.xz Essentials-f558a57824de77aed4574c13cc45a89cf97e9f63.zip |
Merge branch 'API' of https://github.com/essentials/Essentials into API
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.*; |