From 754ed869f166d69eba177946da49bf66193d5993 Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Tue, 1 Nov 2016 21:30:52 +0100
Subject: [PATCH] Finished player info things

---
 .../buttondevteam/discordplugin/MCListener.java   | 12 ++++++++++++
 .../discordplugin/commands/UserinfoCommand.java   | 15 +++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/main/java/buttondevteam/discordplugin/MCListener.java b/src/main/java/buttondevteam/discordplugin/MCListener.java
index 9f4934c..84d8ea2 100644
--- a/src/main/java/buttondevteam/discordplugin/MCListener.java
+++ b/src/main/java/buttondevteam/discordplugin/MCListener.java
@@ -7,7 +7,9 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.server.ServerCommandEvent;
 
 import buttondevteam.discordplugin.commands.ConnectCommand;
+import buttondevteam.lib.TBMCPlayerGetInfoEvent;
 import buttondevteam.lib.TBMCPlayerJoinEvent;
+import sx.blah.discord.handle.obj.IUser;
 
 public class MCListener implements Listener {
 	@EventHandler
@@ -31,4 +33,14 @@ public class MCListener implements Listener {
 				+ ConnectCommand.WaitingToConnect.get(e.GetPlayer().getPlayerName()) + " do /discord accept");
 		p.sendMessage("§bIf it wasn't you, do /discord decline");
 	}
+
+	@EventHandler
+	public void onGetInfo(TBMCPlayerGetInfoEvent e) {
+		DiscordPlayer dp = e.getPlayer().asPluginPlayer(DiscordPlayer.class);
+		if (dp.getDiscordID() == null || dp.getDiscordID() == "")
+			return;
+		IUser user = DiscordPlugin.dc.getUserByID(dp.getDiscordID());
+		e.addInfo("Discord tag: " + user.getName() + "#" + user.getDiscriminator());
+		e.addInfo("Discord status: " + user.getStatus());
+	}
 }
diff --git a/src/main/java/buttondevteam/discordplugin/commands/UserinfoCommand.java b/src/main/java/buttondevteam/discordplugin/commands/UserinfoCommand.java
index 8f8a591..4687329 100644
--- a/src/main/java/buttondevteam/discordplugin/commands/UserinfoCommand.java
+++ b/src/main/java/buttondevteam/discordplugin/commands/UserinfoCommand.java
@@ -2,13 +2,10 @@ package buttondevteam.discordplugin.commands;
 
 import java.util.List;
 
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
 import buttondevteam.discordplugin.DiscordPlayer;
 import buttondevteam.discordplugin.DiscordPlugin;
 import buttondevteam.lib.TBMCPlayer;
-import sx.blah.discord.handle.impl.obj.Guild;
+import buttondevteam.lib.TBMCPlayer.InfoTarget;
 import sx.blah.discord.handle.obj.IMessage;
 import sx.blah.discord.handle.obj.IUser;
 
@@ -63,11 +60,13 @@ public class UserinfoCommand extends DiscordCommandBase {
 			}
 			target = targets.get(0);
 		}
-		for (Player p : Bukkit.getOnlinePlayers()) {
-			DiscordPlayer dp = TBMCPlayer.getPlayer(p).asPluginPlayer(DiscordPlayer.class);
+		for (TBMCPlayer player : TBMCPlayer.getLoadedPlayers().values()) {
+			DiscordPlayer dp = player.asPluginPlayer(DiscordPlayer.class);
 			if (target.getID().equals(dp.getDiscordID())) {
-				DiscordPlugin.sendMessageToChannel(message.getChannel(), "User info for " + target.getName());
-				break; // TODO: Get user data
+				StringBuilder uinfo = new StringBuilder("User info for ").append(target.getName()).append(":");
+				uinfo.append(player.getInfo(InfoTarget.Discord));
+				DiscordPlugin.sendMessageToChannel(message.getChannel(), uinfo.toString());
+				break;
 			}
 		}
 	}