mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-07-27 07:52:06 +00:00
Cleanup XMPP PR
This commit is contained in:
parent
27ee587887
commit
f53240191f
3 changed files with 539 additions and 545 deletions
|
@ -3,9 +3,6 @@ package com.earth2me.essentials.xmpp;
|
||||||
import com.earth2me.essentials.IEssentials;
|
import com.earth2me.essentials.IEssentials;
|
||||||
import com.earth2me.essentials.User;
|
import com.earth2me.essentials.User;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.logging.Level;
|
|
||||||
import java.util.logging.Logger;
|
|
||||||
import net.ess3.api.IUser;
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
|
@ -13,7 +10,6 @@ import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.player.AsyncPlayerChatEvent;
|
import org.bukkit.event.player.AsyncPlayerChatEvent;
|
||||||
import org.bukkit.event.player.PlayerJoinEvent;
|
import org.bukkit.event.player.PlayerJoinEvent;
|
||||||
import org.bukkit.event.player.PlayerQuitEvent;
|
import org.bukkit.event.player.PlayerQuitEvent;
|
||||||
import org.bukkit.Server;
|
|
||||||
|
|
||||||
|
|
||||||
class EssentialsXMPPPlayerListener implements Listener
|
class EssentialsXMPPPlayerListener implements Listener
|
||||||
|
@ -84,7 +80,6 @@ class EssentialsXMPPPlayerListener implements Listener
|
||||||
{
|
{
|
||||||
EssentialsXMPP.getInstance().sendMessage(address, message);
|
EssentialsXMPP.getInstance().sendMessage(address, message);
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package com.earth2me.essentials.xmpp;
|
package com.earth2me.essentials.xmpp;
|
||||||
|
|
||||||
import com.earth2me.essentials.IEssentials;
|
|
||||||
import com.earth2me.essentials.Console;
|
import com.earth2me.essentials.Console;
|
||||||
import com.earth2me.essentials.EssentialsConf;
|
import com.earth2me.essentials.EssentialsConf;
|
||||||
import com.earth2me.essentials.IConf;
|
import com.earth2me.essentials.IConf;
|
||||||
|
@ -13,15 +12,12 @@ import java.util.logging.Level;
|
||||||
import java.util.logging.LogRecord;
|
import java.util.logging.LogRecord;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
import java.util.logging.SimpleFormatter;
|
import java.util.logging.SimpleFormatter;
|
||||||
import org.bukkit.Server;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.jivesoftware.smack.*;
|
import org.jivesoftware.smack.*;
|
||||||
import org.jivesoftware.smack.Roster.SubscriptionMode;
|
import org.jivesoftware.smack.Roster.SubscriptionMode;
|
||||||
import org.jivesoftware.smack.packet.Message;
|
import org.jivesoftware.smack.packet.Message;
|
||||||
import org.jivesoftware.smack.packet.Presence;
|
import org.jivesoftware.smack.packet.Presence;
|
||||||
import org.jivesoftware.smack.util.StringUtils;
|
import org.jivesoftware.smack.util.StringUtils;
|
||||||
import org.bukkit.plugin.PluginManager;
|
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
|
||||||
|
|
||||||
|
|
||||||
public class XMPPManager extends Handler implements MessageListener, ChatManagerListener, IConf
|
public class XMPPManager extends Handler implements MessageListener, ChatManagerListener, IConf
|
||||||
|
@ -169,17 +165,20 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager
|
||||||
|
|
||||||
usercount = parent.getServer().getOnlinePlayers().length;
|
usercount = parent.getServer().getOnlinePlayers().length;
|
||||||
|
|
||||||
if (usercount == 0) {
|
if (usercount == 0)
|
||||||
|
{
|
||||||
final String presenceMsg = "No one online.";
|
final String presenceMsg = "No one online.";
|
||||||
connection.sendPacket(new Presence(Presence.Type.available, presenceMsg, 2, Presence.Mode.available));
|
|
||||||
}
|
|
||||||
if (usercount == 1) {
|
|
||||||
final String presenceMsg = "1 player online.";
|
|
||||||
connection.sendPacket(new Presence(Presence.Type.available, presenceMsg, 2, Presence.Mode.dnd));
|
connection.sendPacket(new Presence(Presence.Type.available, presenceMsg, 2, Presence.Mode.dnd));
|
||||||
}
|
}
|
||||||
if (usercount > 1) {
|
if (usercount == 1)
|
||||||
|
{
|
||||||
|
final String presenceMsg = "1 player online.";
|
||||||
|
connection.sendPacket(new Presence(Presence.Type.available, presenceMsg, 2, Presence.Mode.available));
|
||||||
|
}
|
||||||
|
if (usercount > 1)
|
||||||
|
{
|
||||||
stringBuilder.append(usercount).append(" players online.");
|
stringBuilder.append(usercount).append(" players online.");
|
||||||
connection.sendPacket(new Presence(Presence.Type.available, stringBuilder.toString(), 2, Presence.Mode.dnd));
|
connection.sendPacket(new Presence(Presence.Type.available, stringBuilder.toString(), 2, Presence.Mode.available));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue