Round 1 of fixing getPlayer in commands

32 files changed, 38 insertions, 36 deletions

diff --git a/Essentials/src/net/ess3/commands/Commandban.java b/Essentials/src/net/ess3/commands/Commandban.java
index c94f30e9e..85b7ffc1b 100644
--- a/Essentials/src/net/ess3/commands/Commandban.java
+++ b/Essentials/src/net/ess3/commands/Commandban.java
@@ -20,7 +20,7 @@ public class Commandban extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 		@Cleanup
-		final IUser user = getPlayer(args, 0, true);
+		final IUser user = ess.getUserMap().matchUser(args[0], false, true);
 		if (!user.isOnline())
 		{
 			if (sender instanceof Player && Permissions.BAN_OFFLINE.isAuthorized(user))
diff --git a/Essentials/src/net/ess3/commands/Commandclearinventory.java b/Essentials/src/net/ess3/commands/Commandclearinventory.java
index ae0977907..3c91f38a9 100644
--- a/Essentials/src/net/ess3/commands/Commandclearinventory.java
+++ b/Essentials/src/net/ess3/commands/Commandclearinventory.java
@@ -34,7 +34,7 @@ public class Commandclearinventory extends EssentialsCommand
 			}
 			else
 			{
-				Player p = server.getPlayer(args[0]);
+				Player p = ess.getUserMap().matchUser(args[0], false, false);
 				if (p != null)
 				{
 					p.getInventory().clear();
diff --git a/Essentials/src/net/ess3/commands/Commanddelhome.java b/Essentials/src/net/ess3/commands/Commanddelhome.java
index 61f5cdbfc..fc3e220bc 100644
--- a/Essentials/src/net/ess3/commands/Commanddelhome.java
+++ b/Essentials/src/net/ess3/commands/Commanddelhome.java
@@ -37,7 +37,7 @@ public class Commanddelhome extends EssentialsCommand
 
 		if (expandedArg.length > 1 && (user == null || Permissions.DELHOME_OTHERS.isAuthorized(user)))
 		{
-			user = getPlayer(expandedArg, 0, true);
+			user = ess.getUserMap().matchUser(expandedArg[1], false, true);
 			name = expandedArg[1];
 		}
 		else if (user == null)
diff --git a/Essentials/src/net/ess3/commands/Commandeco.java b/Essentials/src/net/ess3/commands/Commandeco.java
index e51c31fdb..4464b4606 100644
--- a/Essentials/src/net/ess3/commands/Commandeco.java
+++ b/Essentials/src/net/ess3/commands/Commandeco.java
@@ -88,7 +88,7 @@ public class Commandeco extends EssentialsCommand
 		}
 		else
 		{
-			final IUser player = getPlayer(args, 1, true);
+			final IUser player = ess.getUserMap().matchUser(args[0], true, true);
 			switch (cmd)
 			{
 			case GIVE:
diff --git a/Essentials/src/net/ess3/commands/Commandenchant.java b/Essentials/src/net/ess3/commands/Commandenchant.java
index 4c4a4bffa..c84acdb66 100644
--- a/Essentials/src/net/ess3/commands/Commandenchant.java
+++ b/Essentials/src/net/ess3/commands/Commandenchant.java
@@ -68,7 +68,7 @@ public class Commandenchant extends EssentialsCommand
 		{
 			stack.addEnchantment(enchantment, level);
 		}
-		user.getInventory().setItemInHand(stack);
+		user.getInventory().setxItemInHand(stack);
 		user.updateInventory();
 		final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH);
 		if (level == 0)
diff --git a/Essentials/src/net/ess3/commands/Commandgetpos.java b/Essentials/src/net/ess3/commands/Commandgetpos.java
index c5141eca2..5c0273742 100644
--- a/Essentials/src/net/ess3/commands/Commandgetpos.java
+++ b/Essentials/src/net/ess3/commands/Commandgetpos.java
@@ -15,7 +15,7 @@ public class Commandgetpos extends EssentialsCommand
 		if (args.length > 0 && Permissions.GETPOS_OTHERS.isAuthorized(user))
 		{
 			//todo permissions
-			final IUser otherUser = getPlayer(args, 0);
+			final IUser otherUser = ess.getUserMap().matchUser(args[0], false, false);
 			if (!otherUser.isHidden() || Permissions.LIST_HIDDEN.isAuthorized(user))
 			{
 				outputPosition(user, otherUser.getLocation(), user.getLocation());
@@ -33,7 +33,7 @@ public class Commandgetpos extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		final IUser user = getPlayer(args, 0);
+		final IUser user = ess.getUserMap().matchUser(args[0], false, false);
 		outputPosition(sender, user.getLocation(), null);
 	}
 
diff --git a/Essentials/src/net/ess3/commands/Commandhome.java b/Essentials/src/net/ess3/commands/Commandhome.java
index 70a2e9870..afcac8979 100644
--- a/Essentials/src/net/ess3/commands/Commandhome.java
+++ b/Essentials/src/net/ess3/commands/Commandhome.java
@@ -33,7 +33,7 @@ public class Commandhome extends EssentialsCommand
 			}
 			else
 			{
-				player = getPlayer(nameParts, 0, true);
+				player = ess.getUserMap().matchUser(nameParts[0], false, true);
 				if (nameParts.length > 1)
 				{
 					homeName = nameParts[1];
diff --git a/Essentials/src/net/ess3/commands/Commandignore.java b/Essentials/src/net/ess3/commands/Commandignore.java
index 82261dbfa..d421e62f2 100644
--- a/Essentials/src/net/ess3/commands/Commandignore.java
+++ b/Essentials/src/net/ess3/commands/Commandignore.java
@@ -16,7 +16,7 @@ public class Commandignore extends EssentialsCommand
 		IUser player;
 		try
 		{
-			player = getPlayer(args, 0);
+			player = ess.getUserMap().matchUser(args[0], false, false);
 		}
 		catch (NoSuchFieldException ex)
 		{
diff --git a/Essentials/src/net/ess3/commands/Commandinvsee.java b/Essentials/src/net/ess3/commands/Commandinvsee.java
index 04b3eb215..41f031cef 100644
--- a/Essentials/src/net/ess3/commands/Commandinvsee.java
+++ b/Essentials/src/net/ess3/commands/Commandinvsee.java
@@ -21,7 +21,7 @@ public class Commandinvsee extends EssentialsCommand
 		IUser invUser = user;
 		if (args.length == 1)
 		{
-			invUser = getPlayer(args, 0);
+			invUser = ess.getUserMap().matchUser(args[0], false, false);
 		}
 		user.acquireWriteLock();
 		if (invUser == user && user.getData().getInventory() != null)
diff --git a/Essentials/src/net/ess3/commands/Commandkick.java b/Essentials/src/net/ess3/commands/Commandkick.java
index 68ce363bc..de6495be0 100644
--- a/Essentials/src/net/ess3/commands/Commandkick.java
+++ b/Essentials/src/net/ess3/commands/Commandkick.java
@@ -18,7 +18,7 @@ public class Commandkick extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 
-		final IUser user = getPlayer(args, 0);
+		final IUser user = ess.getUserMap().matchUser(args[0], false, false);
 		if (Permissions.KICK_EXEMPT.isAuthorized(user))
 		{
 			throw new Exception(_("kickExempt"));
diff --git a/Essentials/src/net/ess3/commands/Commandmsg.java b/Essentials/src/net/ess3/commands/Commandmsg.java
index 91f38f38b..ce29ed5b9 100644
--- a/Essentials/src/net/ess3/commands/Commandmsg.java
+++ b/Essentials/src/net/ess3/commands/Commandmsg.java
@@ -62,7 +62,7 @@ public class Commandmsg extends EssentialsCommand
 			return;
 		}
 
-		final List<Player> matchedPlayers = server.matchPlayer(args[0]);
+		final List<Player> matchedPlayers = ess.getUserMap().matchUser(args[0], false, false);
 
 		if (matchedPlayers.isEmpty())
 		{
diff --git a/Essentials/src/net/ess3/commands/Commandmute.java b/Essentials/src/net/ess3/commands/Commandmute.java
index 30043b95d..fe3ae21b5 100644
--- a/Essentials/src/net/ess3/commands/Commandmute.java
+++ b/Essentials/src/net/ess3/commands/Commandmute.java
@@ -20,7 +20,7 @@ public class Commandmute extends EssentialsCommand
 		}
 
 		@Cleanup
-		final IUser player = getPlayer(args, 0, true);
+		final IUser player = ess.getUserMap().matchUser(args[0], false, true);
 		player.acquireReadLock(); 
 		if (!player.getData().isMuted() && Permissions.MUTE_EXEMPT.isAuthorized(player))
 		{
diff --git a/Essentials/src/net/ess3/commands/Commandnear.java b/Essentials/src/net/ess3/commands/Commandnear.java
index 2d52825c4..86aa0bc03 100644
--- a/Essentials/src/net/ess3/commands/Commandnear.java
+++ b/Essentials/src/net/ess3/commands/Commandnear.java
@@ -22,7 +22,7 @@ public class Commandnear extends EssentialsCommand
 		{
 			try
 			{
-				otherUser = getPlayer(args, 0);
+				otherUser = ess.getUserMap().matchUser(args[0], false, false);
 			}
 			catch (Exception ex)
 			{
@@ -62,7 +62,7 @@ public class Commandnear extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		final IUser otherUser = getPlayer(args, 0);
+		final IUser otherUser = ess.getUserMap().matchUser(args[0], false, false);
 		long radius = 200;
 		if (args.length > 1)
 		{
diff --git a/Essentials/src/net/ess3/commands/Commandnick.java b/Essentials/src/net/ess3/commands/Commandnick.java
index fad5bc348..a0ec13c91 100644
--- a/Essentials/src/net/ess3/commands/Commandnick.java
+++ b/Essentials/src/net/ess3/commands/Commandnick.java
@@ -34,7 +34,7 @@ public class Commandnick extends EssentialsCommand
 			{
 				throw new Exception(_("nickOthersPermission"));
 			}
-			setNickname(getPlayer(args, 0), formatNickname(user, args[1]));
+			setNickname(ess.getUserMap().matchUser(args[0], false, false), formatNickname(user, args[1]));
 			user.sendMessage(_("nickChanged"));
 			return;
 		}
@@ -61,7 +61,7 @@ public class Commandnick extends EssentialsCommand
 		}
 		else
 		{
-			setNickname(getPlayer(args, 0), formatNickname(null, args[1]));
+			setNickname(ess.getUserMap().matchUser(args[0], false, false), formatNickname(null, args[1]));
 		}
 		sender.sendMessage(_("nickChanged"));
 	}
diff --git a/Essentials/src/net/ess3/commands/Commandseen.java b/Essentials/src/net/ess3/commands/Commandseen.java
index 7a47cb52c..9dbb6a7f9 100644
--- a/Essentials/src/net/ess3/commands/Commandseen.java
+++ b/Essentials/src/net/ess3/commands/Commandseen.java
@@ -31,7 +31,7 @@ public class Commandseen extends EssentialsCommand
 		}
 		try
 		{
-			IUser u = getPlayer(args, 0);
+			IUser u = ess.getUserMap().matchUser(args[0], false, false);
 			sender.sendMessage(_("seenOnline", u.getDisplayName(), DateUtil.formatDateDiff(u.getTimestamp(TimestampType.LOGIN))));
 		}
 		catch (NoSuchFieldException e)
diff --git a/Essentials/src/net/ess3/commands/Commandspawn.java b/Essentials/src/net/ess3/commands/Commandspawn.java
index 213f14211..bb177ae79 100644
--- a/Essentials/src/net/ess3/commands/Commandspawn.java
+++ b/Essentials/src/net/ess3/commands/Commandspawn.java
@@ -20,7 +20,7 @@ public class Commandspawn extends EssentialsCommand
 		charge.isAffordableFor(user);
 		if (args.length > 0 && Permissions.SPAWN_OTHERS.isAuthorized(user))
 		{
-			final IUser otherUser = getPlayer(args, 0);
+			final IUser otherUser = ess.getUserMap().matchUser(args[0], false, false);
 			respawn(otherUser, null);
 			if (!otherUser.equals(user))
 			{
@@ -41,7 +41,7 @@ public class Commandspawn extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		final IUser user = getPlayer(args, 0);
+		final IUser user = ess.getUserMap().matchUser(args[0], false, false);
 		respawn(user, null);
 		user.sendMessage(_("teleportAtoB", user.getDisplayName(), "spawn"));
 		sender.sendMessage(_("teleporting"));
diff --git a/Essentials/src/net/ess3/commands/Commandsudo.java b/Essentials/src/net/ess3/commands/Commandsudo.java
index d77241348..84d5d9b36 100644
--- a/Essentials/src/net/ess3/commands/Commandsudo.java
+++ b/Essentials/src/net/ess3/commands/Commandsudo.java
@@ -16,7 +16,7 @@ public class Commandsudo extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 
-		final IUser user = getPlayer(args, 0, false);
+		final IUser user = ess.getUserMap().matchUser(args[0], false, false);
 		final String command = args[1];
 		final String[] arguments = new String[args.length - 2];
 		if (arguments.length > 0)
diff --git a/Essentials/src/net/ess3/commands/Commandtempban.java b/Essentials/src/net/ess3/commands/Commandtempban.java
index 4b2c0d041..fe3f01b1f 100644
--- a/Essentials/src/net/ess3/commands/Commandtempban.java
+++ b/Essentials/src/net/ess3/commands/Commandtempban.java
@@ -20,7 +20,7 @@ public class Commandtempban extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		final IUser user = getPlayer(args, 0, true);
+		final IUser user = ess.getUserMap().matchUser(args[0], false, true);
 		if (!user.isOnline())
 		{
 			if (Permissions.TEMPBAN_OFFLINE.isAuthorized(sender))
diff --git a/Essentials/src/net/ess3/commands/Commandtogglejail.java b/Essentials/src/net/ess3/commands/Commandtogglejail.java
index bc1c3d127..8cd17d683 100644
--- a/Essentials/src/net/ess3/commands/Commandtogglejail.java
+++ b/Essentials/src/net/ess3/commands/Commandtogglejail.java
@@ -21,7 +21,7 @@ public class Commandtogglejail extends EssentialsCommand
 		}
 
 		@Cleanup
-		final IUser player = getPlayer(args, 0, true);
+		final IUser player = ess.getUserMap().matchUser(args[0], false, true);
 		player.acquireReadLock();
 
 		if (args.length >= 2 && !player.getData().isJailed())
diff --git a/Essentials/src/net/ess3/commands/Commandtp.java b/Essentials/src/net/ess3/commands/Commandtp.java
index 7fbfd1b54..a9b4873d6 100644
--- a/Essentials/src/net/ess3/commands/Commandtp.java
+++ b/Essentials/src/net/ess3/commands/Commandtp.java
@@ -28,7 +28,7 @@ public class Commandtp extends EssentialsCommand
 
 		case 1:
 			@Cleanup
-			final IUser player = getPlayer(args, 0);
+			final IUser player = ess.getUserMap().matchUser(args[0], false, false);
 			player.acquireReadLock();
 			if (!player.getData().isTeleportEnabled())
 			{
@@ -52,9 +52,9 @@ public class Commandtp extends EssentialsCommand
 			}
 			user.sendMessage(_("teleporting"));
 			@Cleanup
-			final IUser target = getPlayer(args, 0);
+			final IUser target = ess.getUserMap().matchUser(args[0], false, false);
 			@Cleanup
-			final IUser toPlayer = getPlayer(args, 1);
+			final IUser toPlayer = ess.getUserMap().matchUser(args[1], false, false);
 			target.acquireReadLock();
 			toPlayer.acquireReadLock();
 
diff --git a/Essentials/src/net/ess3/commands/Commandtpa.java b/Essentials/src/net/ess3/commands/Commandtpa.java
index 999b57ec3..db78e27e7 100644
--- a/Essentials/src/net/ess3/commands/Commandtpa.java
+++ b/Essentials/src/net/ess3/commands/Commandtpa.java
@@ -18,7 +18,7 @@ public class Commandtpa extends EssentialsCommand
 		}
 
 		@Cleanup
-		IUser player = getPlayer(args, 0);
+		IUser player = ess.getUserMap().matchUser(args[0], false, false);
 		player.acquireReadLock();
 		if (!player.getData().isTeleportEnabled())
 		{
diff --git a/Essentials/src/net/ess3/commands/Commandtpaall.java b/Essentials/src/net/ess3/commands/Commandtpaall.java
index c4f2696b2..79bc2a5fd 100644
--- a/Essentials/src/net/ess3/commands/Commandtpaall.java
+++ b/Essentials/src/net/ess3/commands/Commandtpaall.java
@@ -24,7 +24,7 @@ public class Commandtpaall extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 
-		final IUser player = getPlayer(args, 0);
+		final IUser player = ess.getUserMap().matchUser(args[0], false, false);
 		teleportAAllPlayers(sender, player);
 	}
 
diff --git a/Essentials/src/net/ess3/commands/Commandtpahere.java b/Essentials/src/net/ess3/commands/Commandtpahere.java
index 01e3dd29b..6ae1c036a 100644
--- a/Essentials/src/net/ess3/commands/Commandtpahere.java
+++ b/Essentials/src/net/ess3/commands/Commandtpahere.java
@@ -18,7 +18,7 @@ public class Commandtpahere extends EssentialsCommand
 		}
 
 		@Cleanup
-		final IUser player = getPlayer(args, 0);
+		final IUser player = ess.getUserMap().matchUser(args[0], false, false);
 		player.acquireReadLock();
 		if (!player.getData().isTeleportEnabled())
 		{
diff --git a/Essentials/src/net/ess3/commands/Commandtpall.java b/Essentials/src/net/ess3/commands/Commandtpall.java
index 373c51a4d..107db6bcd 100644
--- a/Essentials/src/net/ess3/commands/Commandtpall.java
+++ b/Essentials/src/net/ess3/commands/Commandtpall.java
@@ -26,7 +26,7 @@ public class Commandtpall extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 
-		final IUser player = getPlayer(args, 0);
+		final IUser player = ess.getUserMap().matchUser(args[0], false, false);
 		teleportAllPlayers(sender, player);
 	}
 
diff --git a/Essentials/src/net/ess3/commands/Commandtphere.java b/Essentials/src/net/ess3/commands/Commandtphere.java
index 78d571423..7b26f53d4 100644
--- a/Essentials/src/net/ess3/commands/Commandtphere.java
+++ b/Essentials/src/net/ess3/commands/Commandtphere.java
@@ -14,7 +14,7 @@ public class Commandtphere extends EssentialsCommand
 	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
 		@Cleanup
-		final IUser player = getPlayer(args, 0);
+		final IUser player = ess.getUserMap().matchUser(args[0], false, false);
 		player.acquireReadLock();
 		if (!player.getData().isTeleportEnabled())
 		{
diff --git a/Essentials/src/net/ess3/commands/Commandtpo.java b/Essentials/src/net/ess3/commands/Commandtpo.java
index 2a90fa045..8cef5bb81 100644
--- a/Essentials/src/net/ess3/commands/Commandtpo.java
+++ b/Essentials/src/net/ess3/commands/Commandtpo.java
@@ -18,7 +18,7 @@ public class Commandtpo extends EssentialsCommand
 		}
 
 		//Just basically the old tp command
-		final IUser player = getPlayer(args, 0, true);
+		final IUser player = ess.getUserMap().matchUser(args[0], false, true);
 		// Check if user is offline
 		if (!player.isOnline())
 		{
diff --git a/Essentials/src/net/ess3/commands/Commandtpohere.java b/Essentials/src/net/ess3/commands/Commandtpohere.java
index e9a392591..d58384144 100644
--- a/Essentials/src/net/ess3/commands/Commandtpohere.java
+++ b/Essentials/src/net/ess3/commands/Commandtpohere.java
@@ -21,7 +21,7 @@ public class Commandtpohere extends EssentialsCommand
 		}
 
 		//Just basically the old tphere command
-		final IUser player = getPlayer(args, 0, true);
+		final IUser player = ess.getUserMap().matchUser(args[0], false, true);
 
 		// Check if user is offline
 		if (!player.isOnline())
diff --git a/Essentials/src/net/ess3/commands/Commandtppos.java b/Essentials/src/net/ess3/commands/Commandtppos.java
index e7f5859b8..3cf658f71 100644
--- a/Essentials/src/net/ess3/commands/Commandtppos.java
+++ b/Essentials/src/net/ess3/commands/Commandtppos.java
@@ -2,6 +2,7 @@ package net.ess3.commands;
 
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
+import net.ess3.api.server.CommandSender;
 import net.ess3.api.server.Location;
 import net.ess3.economy.Trade;
 //TODO: remove bukkit
diff --git a/Essentials/src/net/ess3/commands/Commandunban.java b/Essentials/src/net/ess3/commands/Commandunban.java
index cd82ba509..75d9081bd 100644
--- a/Essentials/src/net/ess3/commands/Commandunban.java
+++ b/Essentials/src/net/ess3/commands/Commandunban.java
@@ -19,7 +19,7 @@ public class Commandunban extends EssentialsCommand
 		try
 		{
 			@Cleanup
-			final IUser player = getPlayer(args, 0, true);
+			final IUser player = ess.getUserMap().matchUser(args[0], false, true);
 			player.acquireWriteLock();
 			player.getData().setBan(null);
 			player.setBanned(false);
diff --git a/Essentials/src/net/ess3/commands/Commandunbanip.java b/Essentials/src/net/ess3/commands/Commandunbanip.java
index 03c8fcb75..7243eb370 100644
--- a/Essentials/src/net/ess3/commands/Commandunbanip.java
+++ b/Essentials/src/net/ess3/commands/Commandunbanip.java
@@ -18,7 +18,7 @@ public class Commandunbanip extends EssentialsCommand
 		try
 		{
 			@Cleanup
-			final IUser user = getPlayer(args, 0, true);
+			final IUser user = ess.getUserMap().matchUser(args[0], false, true);
 			user.acquireReadLock();
 			ess.getServer().unbanIP(user.getData().getIpAddress());
 		}
diff --git a/Essentials/src/net/ess3/commands/Commandunlimited.java b/Essentials/src/net/ess3/commands/Commandunlimited.java
index 88115ab64..9f182a6a7 100644
--- a/Essentials/src/net/ess3/commands/Commandunlimited.java
+++ b/Essentials/src/net/ess3/commands/Commandunlimited.java
@@ -26,7 +26,7 @@ public class Commandunlimited extends EssentialsCommand
 
 		if (args.length > 1 && Permissions.UNLIMITED_OTHERS.isAuthorized(user))
 		{
-			target = getPlayer(args, 1);
+			target = ess.getUserMap().matchUser(args[1], false, false);
 			target.acquireReadLock();
 		}
 
diff --git a/Essentials/src/net/ess3/commands/Commandworth.java b/Essentials/src/net/ess3/commands/Commandworth.java
index 9b0939f8f..deda51c6c 100644
--- a/Essentials/src/net/ess3/commands/Commandworth.java
+++ b/Essentials/src/net/ess3/commands/Commandworth.java
@@ -5,6 +5,7 @@ import net.ess3.utils.Util;
 import net.ess3.api.IUser;
 import net.ess3.api.server.ItemStack;
 import java.util.Locale;
+import net.ess3.api.server.CommandSender;
 
 
 public class Commandworth extends EssentialsCommand