--- miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/MsgCommand.java	2012/04/03 10:06:23	1767
+++ miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/MsgCommand.java	2012/04/03 20:21:02	1768
@@ -1,42 +1,46 @@
 package dk.thoerup.bukkit.hoeruputils;
 
-import org.bukkit.Server;
 import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public class MsgCommand implements CommandExecutor {
 	
 	Server server;
-	public MsgCommand(Server server) {
-		this.server = server;
+	HoerupUtilsPlugin plugin;
+	public MsgCommand(HoerupUtilsPlugin plugin) {
+		this.plugin = plugin;
+		this.server = plugin.getServer();
 	}
 
 	@Override
 	public boolean onCommand(final CommandSender sender, Command command, String label, String[] args) {
 		
-		if (!(sender instanceof Player)) {
+		/*if (!(sender instanceof Player)) {
 			return false;
 		}
-		Player player = (Player) sender;
+		Player player = (Player) sender;*/
 
 		if (args.length < 2) {
-			player.sendMessage("Usage: /msg <player> <message>");
+			sender.sendMessage("Usage: /msg <player> <message>");
 			return true;
 		}
 		
-		Player target = server.getPlayer(args[0]);
-		if (target == null) {
-			player.sendMessage("Could not find a player named " + args[0]);
+		OfflinePlayer target = server.getOfflinePlayer(args[0]);
+		if (target == null || (target.isOnline() == false && target.hasPlayedBefore()==false) ) {
+			sender.sendMessage("Could not find a player named " + args[0]);
 			return true;
 		}
+		
+	
 
 		StringBuilder sb = new StringBuilder();
 		sb.append(ChatColor.LIGHT_PURPLE);
 		sb.append("[");
-		sb.append( player.getName() );
+		sb.append( sender.getName() );
 		sb.append( " > ");
 		sb.append( target.getName() );
 		sb.append( "]");
@@ -44,8 +48,11 @@
 			sb.append(" ");
 			sb.append(args[i]);
 		}
-		player.sendMessage(sb.toString() );
-		target.sendMessage(sb.toString() );
+		
+		sender.sendMessage(sb.toString() );
+				
+		//target.sendMessage(sb.toString() );
+		plugin.getMessageWrapper().sendMessage(target, sb.toString() );
 
 		
 		return true;