Merge branch 'master' of https://github.com/essentials/Essentials

43 files changed, 178 insertions, 169 deletions

diff --git a/Essentials/src/net/ess3/Essentials.java b/Essentials/src/net/ess3/Essentials.java
index 8766ac1dd..a373b672a 100644
--- a/Essentials/src/net/ess3/Essentials.java
+++ b/Essentials/src/net/ess3/Essentials.java
@@ -350,4 +350,10 @@ public class Essentials implements IEssentials
 	{
 		return economy;
 	}
+	
+	@Override
+	public void reload()
+	{
+		//do something
+	}
 }
diff --git a/Essentials/src/net/ess3/Jails.java b/Essentials/src/net/ess3/Jails.java
index 987ce1503..7dc513a67 100644
--- a/Essentials/src/net/ess3/Jails.java
+++ b/Essentials/src/net/ess3/Jails.java
@@ -42,8 +42,8 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp
 		final PluginManager pluginManager = ess.getServer().getPluginManager();
 		final JailBlockListener blockListener = new JailBlockListener();
 		final JailPlayerListener playerListener = new JailPlayerListener();
-		pluginManager.registerEvents(blockListener, ess);
-		pluginManager.registerEvents(playerListener, ess);
+		pluginManager.registerEvents(blockListener, ess.getPlugin());
+		pluginManager.registerEvents(playerListener, ess.getPlugin());
 	}
 
 	@Override
@@ -157,6 +157,24 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp
 		}
 	}
 
+	@Override
+	public void finishRead()
+	{
+		
+	}
+
+	@Override
+	public void finishWrite()
+	{
+		
+	}
+
+	@Override
+	public int getCount()
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
 
 	private class JailBlockListener implements Listener
 	{
diff --git a/Essentials/src/net/ess3/Teleport.java b/Essentials/src/net/ess3/Teleport.java
index e5679f367..39d6bf8a3 100644
--- a/Essentials/src/net/ess3/Teleport.java
+++ b/Essentials/src/net/ess3/Teleport.java
@@ -70,10 +70,10 @@ public class Teleport implements Runnable, ITeleport
 	{
 		this.started = System.currentTimeMillis();
 		this.delay = delay;
-		this.health = user.getHealth();
-		this.initX = Math.round(user.getLocation().getX() * MOVE_CONSTANT);
-		this.initY = Math.round(user.getLocation().getY() * MOVE_CONSTANT);
-		this.initZ = Math.round(user.getLocation().getZ() * MOVE_CONSTANT);
+		this.health = user.getPlayer().getHealth();
+		this.initX = Math.round(user.getPlayer().getLocation().getX() * MOVE_CONSTANT);
+		this.initY = Math.round(user.getPlayer().getLocation().getY() * MOVE_CONSTANT);
+		this.initZ = Math.round(user.getPlayer().getLocation().getZ() * MOVE_CONSTANT);
 		this.teleportTarget = target;
 		this.chargeFor = chargeFor;
 		this.cause = cause;
@@ -83,21 +83,21 @@ public class Teleport implements Runnable, ITeleport
 	public void run()
 	{
 
-		if (user == null || !user.isOnline() || user.getLocation() == null)
+		if (user == null || !user.isOnline() || user.getPlayer().getLocation() == null)
 		{
 			cancel();
 			return;
 		}
-		if (Math.round(user.getLocation().getX() * MOVE_CONSTANT) != initX
-			|| Math.round(user.getLocation().getY() * MOVE_CONSTANT) != initY
-			|| Math.round(user.getLocation().getZ() * MOVE_CONSTANT) != initZ
-			|| user.getHealth() < health)
+		if (Math.round(user.getPlayer().getLocation().getX() * MOVE_CONSTANT) != initX
+			|| Math.round(user.getPlayer().getLocation().getY() * MOVE_CONSTANT) != initY
+			|| Math.round(user.getPlayer().getLocation().getZ() * MOVE_CONSTANT) != initZ
+			|| user.getPlayer().getHealth() < health)
 		{	// user moved, cancel teleport
 			cancel(true);
 			return;
 		}
 
-		health = user.getHealth();  // in case user healed, then later gets injured
+		health = user.getPlayer().getHealth();  // in case user healed, then later gets injured
 
 		long now = System.currentTimeMillis();
 		if (now > started + delay)
@@ -137,7 +137,7 @@ public class Teleport implements Runnable, ITeleport
 	public void respawn(final Trade chargeFor, TeleportCause cause) throws Exception
 	{
 		final Location bed = user.getBedSpawnLocation();
-		final Location respawnLoc = ess.getPlugin().callRespawnEvent(user, bed == null ? user.getWorld().getSpawnLocation() : bed, bed != null);
+		final Location respawnLoc = ess.getPlugin().callRespawnEvent(user.getPlayer(), bed == null ? user.getPlayer().getWorld().getSpawnLocation() : bed, bed != null);
 		teleport(new Target(respawnLoc), chargeFor, cause);
 	}
 
diff --git a/Essentials/src/net/ess3/api/IEssentials.java b/Essentials/src/net/ess3/api/IEssentials.java
index efdfa7649..f84633530 100644
--- a/Essentials/src/net/ess3/api/IEssentials.java
+++ b/Essentials/src/net/ess3/api/IEssentials.java
@@ -46,7 +46,7 @@ public interface IEssentials extends IComponent
 	//int scheduleSyncDelayedTask(Runnable run, long delay);
 	//int scheduleSyncRepeatingTask(Runnable run, long delay, long period);
 	//IPermissionsHandler getPermissionsHandler();
-	//void reload();
+	void reload();
 
 	void setRanks(IRanks groups);
 
diff --git a/Essentials/src/net/ess3/commands/Commandeco.java b/Essentials/src/net/ess3/commands/Commandeco.java
index 7b5f032a6..4b73517f2 100644
--- a/Essentials/src/net/ess3/commands/Commandeco.java
+++ b/Essentials/src/net/ess3/commands/Commandeco.java
@@ -61,7 +61,7 @@ public class Commandeco extends EssentialsCommand
 		{
 			for (Player onlinePlayer : server.getOnlinePlayers())
 			{
-				final IUser player = onlinePlayer.getUser();
+				final IUser player = ess.getUserMap().getUser(onlinePlayer);
 				switch (cmd)
 				{
 				case GIVE:
diff --git a/Essentials/src/net/ess3/commands/Commandenchant.java b/Essentials/src/net/ess3/commands/Commandenchant.java
index f34ad6a70..138682c84 100644
--- a/Essentials/src/net/ess3/commands/Commandenchant.java
+++ b/Essentials/src/net/ess3/commands/Commandenchant.java
@@ -19,7 +19,7 @@ public class Commandenchant extends EssentialsCommand
 	@Override
 	protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
-		final ItemStack stack = user.getItemInHand();
+		final ItemStack stack = user.getPlayer().getItemInHand();
 		if (stack == null)
 		{
 			throw new Exception(_("nothingInHand"));
@@ -63,8 +63,8 @@ public class Commandenchant extends EssentialsCommand
 		{
 			stack.addEnchantment(enchantment, level);
 		}
-		user.getInventory().setItemInHand(stack);
-		user.updateInventory();
+		user.getPlayer().getInventory().setItemInHand(stack);
+		user.getPlayer().updateInventory();
 		final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH);
 		if (level == 0)
 		{
diff --git a/Essentials/src/net/ess3/commands/Commandexp.java b/Essentials/src/net/ess3/commands/Commandexp.java
index e8ca3c962..072434550 100644
--- a/Essentials/src/net/ess3/commands/Commandexp.java
+++ b/Essentials/src/net/ess3/commands/Commandexp.java
@@ -114,9 +114,9 @@ public class Commandexp extends EssentialsCommand
 
 	private void showExp(final CommandSender sender, final IUser target)
 	{
-		final int totalExp = SetExpFix.getTotalExperience(target);
-		final int expLeft = (int)Util.roundDouble(((((3.5 * target.getLevel()) + 6.7) - (totalExp - ((1.75 * (target.getLevel() * target.getLevel())) + (5.00 * target.getLevel())))) + 1));
-		sender.sendMessage(_("exp", target.getDisplayName(), SetExpFix.getTotalExperience(target), target.getLevel(), expLeft));
+		final int totalExp = SetExpFix.getTotalExperience(target.getPlayer());
+		final int expLeft = (int)Util.roundDouble(((((3.5 * target.getPlayer().getLevel()) + 6.7) - (totalExp - ((1.75 * (target.getPlayer().getLevel() * target.getPlayer().getLevel())) + (5.00 * target.getPlayer().getLevel())))) + 1));
+		sender.sendMessage(_("exp", target.getPlayer().getDisplayName(), SetExpFix.getTotalExperience(target.getPlayer()), target.getPlayer().getLevel(), expLeft));
 	}
 
 	private void setExp(final CommandSender sender, final IUser target, final String strAmount, final boolean give)
@@ -124,13 +124,13 @@ public class Commandexp extends EssentialsCommand
 		Long amount = Long.parseLong(strAmount);
 		if (give)
 		{
-			amount += SetExpFix.getTotalExperience(target);
+			amount += SetExpFix.getTotalExperience(target.getPlayer());
 		}
 		if (amount > Integer.MAX_VALUE)
 		{
 			amount = (long)Integer.MAX_VALUE;
 		}
-		SetExpFix.setTotalExperience(target, amount.intValue());
-		sender.sendMessage(_("expSet", target.getDisplayName(), amount));
+		SetExpFix.setTotalExperience(target.getPlayer(), amount.intValue());
+		sender.sendMessage(_("expSet", target.getPlayer().getDisplayName(), amount));
 	}
 }
\ No newline at end of file
diff --git a/Essentials/src/net/ess3/commands/Commandinvsee.java b/Essentials/src/net/ess3/commands/Commandinvsee.java
index 67f3b1852..f20ac8142 100644
--- a/Essentials/src/net/ess3/commands/Commandinvsee.java
+++ b/Essentials/src/net/ess3/commands/Commandinvsee.java
@@ -26,17 +26,17 @@ public class Commandinvsee extends EssentialsCommand
 		user.acquireWriteLock();
 		if (invUser == user && user.getData().getInventory() != null)
 		{
-			invUser.getInventory().setContents(user.getData().getInventory().getBukkitInventory());
+			invUser.getPlayer().getInventory().setContents(user.getData().getInventory().getBukkitInventory());
 			user.getData().setInventory(null);
 			user.sendMessage(_("invRestored"));
 			throw new NoChargeException();
 		}
 		if (user.getData().getInventory() == null)
 		{
-			user.getData().setInventory(new Inventory(user.getInventory().getContents()));
+			user.getData().setInventory(new Inventory(user.getPlayer().getInventory().getContents()));
 		}
-		ItemStack[] invUserStack = invUser.getInventory().getContents();
-		final int userStackLength = user.getInventory().getContents().length;
+		ItemStack[] invUserStack = invUser.getPlayer().getInventory().getContents();
+		final int userStackLength = user.getPlayer().getInventory().getContents().length;
 		if (invUserStack.length < userStackLength)
 		{
 			invUserStack = Arrays.copyOf(invUserStack, userStackLength);
@@ -45,7 +45,7 @@ public class Commandinvsee extends EssentialsCommand
 		{
 			throw new Exception(_("invBigger"));
 		}
-		user.getInventory().setContents(invUserStack);
+		user.getPlayer().getInventory().setContents(invUserStack);
 		user.sendMessage(_("invSee", invUser.getPlayer().getDisplayName()));
 		user.sendMessage(_("invSeeHelp"));
 		throw new NoChargeException();
diff --git a/Essentials/src/net/ess3/commands/Commandpay.java b/Essentials/src/net/ess3/commands/Commandpay.java
index 47b6017fe..d24a3a4a7 100644
--- a/Essentials/src/net/ess3/commands/Commandpay.java
+++ b/Essentials/src/net/ess3/commands/Commandpay.java
@@ -25,10 +25,10 @@ public class Commandpay extends EssentialsCommand
 		double amount = Double.parseDouble(args[1].replaceAll("[^0-9\\.]", ""));
 
 		boolean foundUser = false;
-		for (Player p : ess.getUserMap().matchUsers(args[0], false, true))
+		for (IUser u : ess.getUserMap().matchUsers(args[0], false, true))
 		{
-			user.payUser(p.getUser(), amount);
-			Trade.log("Command", "Pay", "Player", user.getName(), new Trade(amount, ess), p.getName(), new Trade(amount, ess), user.getLocation(), ess);
+			user.payUser(u, amount);
+			Trade.log("Command", "Pay", "Player", user.getName(), new Trade(amount, ess), u.getName(), new Trade(amount, ess), user.getPlayer().getLocation(), ess);
 			foundUser = true;
 		}
 
diff --git a/Essentials/src/net/ess3/commands/Commandpowertool.java b/Essentials/src/net/ess3/commands/Commandpowertool.java
index 461e335cc..00187a4a6 100644
--- a/Essentials/src/net/ess3/commands/Commandpowertool.java
+++ b/Essentials/src/net/ess3/commands/Commandpowertool.java
@@ -27,7 +27,7 @@ public class Commandpowertool extends EssentialsCommand
 			return;
 		}
 
-		final ItemStack itemStack = user.getItemInHand();
+		final ItemStack itemStack = user.getPlayer().getItemInHand();
 		if (itemStack == null || itemStack.getType() == Material.AIR)
 		{
 			throw new Exception(_("powerToolAir"));
diff --git a/Essentials/src/net/ess3/commands/Commandptime.java b/Essentials/src/net/ess3/commands/Commandptime.java
index b1889ff15..357f117b5 100644
--- a/Essentials/src/net/ess3/commands/Commandptime.java
+++ b/Essentials/src/net/ess3/commands/Commandptime.java
@@ -94,14 +94,14 @@ public class Commandptime extends EssentialsCommand
 
 		for (IUser user : users)
 		{
-			if (user.getPlayerTimeOffset() == 0)
+			if (user.getPlayer().getPlayerTimeOffset() == 0)
 			{
 				sender.sendMessage(_("pTimeNormal", user.getName()));
 			}
 			else
 			{
-				String time = DescParseTickFormat.format(user.getPlayerTime());
-				if (!user.isPlayerTimeRelative())
+				String time = DescParseTickFormat.format(user.getPlayer().getPlayerTime());
+				if (!user.getPlayer().isPlayerTimeRelative())
 				{
 					sender.sendMessage(_("pTimeCurrentFixed", user.getName(), time));
 				}
@@ -124,7 +124,7 @@ public class Commandptime extends EssentialsCommand
 			// Reset
 			for (IUser user : users)
 			{
-				user.resetPlayerTime();
+				user.getPlayer().resetPlayerTime();
 			}
 		}
 		else
@@ -132,15 +132,15 @@ public class Commandptime extends EssentialsCommand
 			// Set
 			for (IUser user : users)
 			{
-				final World world = user.getWorld();
-				long time = user.getPlayerTime();
+				final World world = user.getPlayer().getWorld();
+				long time = user.getPlayer().getPlayerTime();
 				time -= time % 24000;
 				time += 24000 + ticks;
 				if (relative)
 				{
 					time -= world.getTime();
 				}
-				user.setPlayerTime(time, relative);
+				user.getPlayer().setPlayerTime(time, relative);
 			}
 		}
 
diff --git a/Essentials/src/net/ess3/commands/Commandr.java b/Essentials/src/net/ess3/commands/Commandr.java
index 6c8e920ce..777be3d2a 100644
--- a/Essentials/src/net/ess3/commands/Commandr.java
+++ b/Essentials/src/net/ess3/commands/Commandr.java
@@ -36,7 +36,7 @@ public class Commandr extends EssentialsCommand
 				message = Util.replaceFormat(message);
 			}
 			replyTo = user;
-			senderName = user.getDisplayName();
+			senderName = user.getPlayer().getDisplayName();
 		}
 		else
 		{
diff --git a/Essentials/src/net/ess3/commands/Commandrealname.java b/Essentials/src/net/ess3/commands/Commandrealname.java
index be07e437f..dcd30abb0 100644
--- a/Essentials/src/net/ess3/commands/Commandrealname.java
+++ b/Essentials/src/net/ess3/commands/Commandrealname.java
@@ -30,7 +30,7 @@ public class Commandrealname extends EssentialsCommand
 				continue;
 			}
 			u.setDisplayNick();
-			final String displayName = Util.stripFormat(u.getDisplayName()).toLowerCase(Locale.ENGLISH);
+			final String displayName = Util.stripFormat(u.getPlayer().getDisplayName()).toLowerCase(Locale.ENGLISH);
 			settings.acquireReadLock();
 			if (!whois.equals(displayName)
 				&& !displayName.equals(Util.stripFormat(settings.getData().getChat().getNicknamePrefix()) + whois)
@@ -38,7 +38,7 @@ public class Commandrealname extends EssentialsCommand
 			{
 				continue;
 			}
-			sender.sendMessage(u.getDisplayName() + " " + _("is") + " " + u.getName());
+			sender.sendMessage(u.getPlayer().getDisplayName() + " " + _("is") + " " + u.getName());
 		}
 	}
 }
diff --git a/Essentials/src/net/ess3/commands/Commandremove.java b/Essentials/src/net/ess3/commands/Commandremove.java
index f8b171259..02cbd16a1 100644
--- a/Essentials/src/net/ess3/commands/Commandremove.java
+++ b/Essentials/src/net/ess3/commands/Commandremove.java
@@ -29,7 +29,7 @@ public class Commandremove extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 		ToRemove toRemove;
-		final World world = user.getWorld();
+		final World world = user.getPlayer().getWorld();
 		int radius = 0;
 
 		if (args.length < 2)
diff --git a/Essentials/src/net/ess3/commands/Commandrepair.java b/Essentials/src/net/ess3/commands/Commandrepair.java
index 9762fc767..c0a9515d7 100644
--- a/Essentials/src/net/ess3/commands/Commandrepair.java
+++ b/Essentials/src/net/ess3/commands/Commandrepair.java
@@ -25,7 +25,7 @@ public class Commandrepair extends EssentialsCommand
 
 		if (args[0].equalsIgnoreCase("hand"))
 		{
-			final ItemStack item = user.getItemInHand();
+			final ItemStack item = user.getPlayer().getItemInHand();
 			if (item == null)
 			{
 				throw new Exception(_("repairInvalidType"));
@@ -53,11 +53,11 @@ public class Commandrepair extends EssentialsCommand
 			final Trade charge = new Trade("repair-all", ess);
 			charge.isAffordableFor(user);
 			final List<String> repaired = new ArrayList<String>();
-			repairItems(user.getInventory().getContents(), user, repaired);
+			repairItems(user.getPlayer().getInventory().getContents(), user, repaired);
 
 			if (Permissions.REPAIR_ARMOR.isAuthorized(user))
 			{
-				repairItems(user.getInventory().getArmorContents(), user, repaired);
+				repairItems(user.getPlayer().getInventory().getArmorContents(), user, repaired);
 			}
 
 			if (repaired.isEmpty())
diff --git a/Essentials/src/net/ess3/commands/Commandseen.java b/Essentials/src/net/ess3/commands/Commandseen.java
index 3394782b5..dce074a98 100644
--- a/Essentials/src/net/ess3/commands/Commandseen.java
+++ b/Essentials/src/net/ess3/commands/Commandseen.java
@@ -4,6 +4,7 @@ import lombok.Cleanup;
 import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
+import net.ess3.user.PlayerNotFoundException;
 import net.ess3.user.UserData.TimestampType;
 import net.ess3.utils.DateUtil;
 import org.bukkit.command.CommandSender;
@@ -31,9 +32,9 @@ public class Commandseen extends EssentialsCommand
 		try
 		{
 			IUser u = ess.getUserMap().matchUser(args[0], false, false);
-			sender.sendMessage(_("seenOnline", u.getDisplayName(), DateUtil.formatDateDiff(u.getTimestamp(TimestampType.LOGIN))));
+			sender.sendMessage(_("seenOnline", u.getPlayer().getDisplayName(), DateUtil.formatDateDiff(u.getTimestamp(TimestampType.LOGIN))));
 		}
-		catch (NoSuchFieldException e)
+		catch (PlayerNotFoundException e)
 		{
 			@Cleanup
 			IUser u = ess.getUserMap().getUser(args[0]);
@@ -42,7 +43,7 @@ public class Commandseen extends EssentialsCommand
 			{
 				throw new Exception(_("playerNotFound"));
 			}
-			sender.sendMessage(_("seenOffline", u.getDisplayName(), DateUtil.formatDateDiff(u.getTimestamp(TimestampType.LOGOUT))));
+			sender.sendMessage(_("seenOffline", u.getPlayer().getDisplayName(), DateUtil.formatDateDiff(u.getTimestamp(TimestampType.LOGOUT))));
 			if (u.isBanned())
 			{
 				sender.sendMessage(_("whoisBanned", show ? u.getData().getBan().getReason() : _("true")));
diff --git a/Essentials/src/net/ess3/commands/Commandsell.java b/Essentials/src/net/ess3/commands/Commandsell.java
index 5fe7fadc5..7ae290953 100644
--- a/Essentials/src/net/ess3/commands/Commandsell.java
+++ b/Essentials/src/net/ess3/commands/Commandsell.java
@@ -24,11 +24,11 @@ public class Commandsell extends EssentialsCommand
 		ItemStack is = null;
 		if (args[0].equalsIgnoreCase("hand"))
 		{
-			is = user.getItemInHand();
+			is = user.getPlayer().getItemInHand();
 		}
 		else if (args[0].equalsIgnoreCase("inventory") || args[0].equalsIgnoreCase("invent") || args[0].equalsIgnoreCase("all"))
 		{
-			for (ItemStack stack : user.getInventory().getContents())
+			for (ItemStack stack : user.getPlayer().getInventory().getContents())
 			{
 				if (stack == null || stack.getType() == Material.AIR)
 				{
@@ -46,7 +46,7 @@ public class Commandsell extends EssentialsCommand
 		}
 		else if (args[0].equalsIgnoreCase("blocks"))
 		{
-			for (ItemStack stack : user.getInventory().getContents())
+			for (ItemStack stack : user.getPlayer().getInventory().getContents())
 			{
 				if (stack == null || stack.getTypeId() > 255 || stack.getType() == Material.AIR)
 				{
@@ -95,7 +95,7 @@ public class Commandsell extends EssentialsCommand
 
 
 		int max = 0;
-		for (ItemStack s : user.getInventory().getContents())
+		for (ItemStack s : user.getPlayer().getInventory().getContents())
 		{
 			if (s == null)
 			{
@@ -142,12 +142,12 @@ public class Commandsell extends EssentialsCommand
 		//TODO: Prices for Enchantments
 		final ItemStack ris = is.clone();
 		ris.setAmount(amount);
-		InventoryWorkaround.removeItem(user.getInventory(), true, true, ris);
-		user.updateInventory();
-		Trade.log("Command", "Sell", "Item", user.getName(), new Trade(ris, ess), user.getName(), new Trade(worth * amount, ess), user.getLocation(), ess);
+		InventoryWorkaround.removeItem(user.getPlayer().getInventory(), true, true, ris);
+		user.getPlayer().updateInventory();
+		Trade.log("Command", "Sell", "Item", user.getName(), new Trade(ris, ess), user.getName(), new Trade(worth * amount, ess), user.getPlayer().getLocation(), ess);
 		user.giveMoney(worth * amount);
 		user.sendMessage(_("itemSold", Util.displayCurrency(worth * amount, ess), amount, is.getType().toString().toLowerCase(Locale.ENGLISH), Util.displayCurrency(worth, ess)));
-		logger.log(Level.INFO, _("itemSoldConsole", user.getDisplayName(), is.getType().toString().toLowerCase(Locale.ENGLISH), Util.displayCurrency(worth * amount, ess), amount, Util.displayCurrency(worth, ess)));
+		logger.log(Level.INFO, _("itemSoldConsole", user.getPlayer().getDisplayName(), is.getType().toString().toLowerCase(Locale.ENGLISH), Util.displayCurrency(worth * amount, ess), amount, Util.displayCurrency(worth, ess)));
 
 	}
 }
diff --git a/Essentials/src/net/ess3/commands/Commandsethome.java b/Essentials/src/net/ess3/commands/Commandsethome.java
index 511d05487..4f74e55dc 100644
--- a/Essentials/src/net/ess3/commands/Commandsethome.java
+++ b/Essentials/src/net/ess3/commands/Commandsethome.java
@@ -38,7 +38,7 @@ public class Commandsethome extends EssentialsCommand
 						{
 							user.getData().setHomes(new HashMap<String, net.ess3.storage.StoredLocation>());
 						}
-						user.getData().getHomes().put(args[0].toLowerCase(Locale.ENGLISH), new net.ess3.storage.StoredLocation(user.getLocation()));
+						user.getData().getHomes().put(args[0].toLowerCase(Locale.ENGLISH), new net.ess3.storage.StoredLocation(user.getPlayer().getLocation()));
 					}
 					else
 					{
@@ -76,7 +76,7 @@ public class Commandsethome extends EssentialsCommand
 					{
 						usersHome.getData().setHomes(new HashMap<String, net.ess3.storage.StoredLocation>());
 					}
-					usersHome.getData().getHomes().put(name, new net.ess3.storage.StoredLocation(user.getLocation()));
+					usersHome.getData().getHomes().put(name, new net.ess3.storage.StoredLocation(user.getPlayer().getLocation()));
 				}
 			}
 		}
@@ -87,9 +87,9 @@ public class Commandsethome extends EssentialsCommand
 			{
 				user.getData().setHomes(new HashMap<String, net.ess3.storage.StoredLocation>());
 			}
-			user.getData().getHomes().put("home", new net.ess3.storage.StoredLocation(user.getLocation()));
+			user.getData().getHomes().put("home", new net.ess3.storage.StoredLocation(user.getPlayer().getLocation()));
 		}
-		user.sendMessage(_("homeSet", user.getLocation().getWorld().getName(), user.getLocation().getBlockX(), user.getLocation().getBlockY(), user.getLocation().getBlockZ()));
+		user.sendMessage(_("homeSet", user.getPlayer().getLocation().getWorld().getName(), user.getPlayer().getLocation().getBlockX(), user.getPlayer().getLocation().getBlockY(), user.getPlayer().getLocation().getBlockZ()));
 
 	}
 }
diff --git a/Essentials/src/net/ess3/commands/Commandsetjail.java b/Essentials/src/net/ess3/commands/Commandsetjail.java
index 9938b025c..a3fd4fbb6 100644
--- a/Essentials/src/net/ess3/commands/Commandsetjail.java
+++ b/Essentials/src/net/ess3/commands/Commandsetjail.java
@@ -14,7 +14,7 @@ public class Commandsetjail extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
-		ess.getJails().setJail(args[0], user.getLocation());
+		ess.getJails().setJail(args[0], user.getPlayer().getLocation());
 		user.sendMessage(_("jailSet", Util.sanitizeString(args[0])));
 
 	}
diff --git a/Essentials/src/net/ess3/commands/Commandsetspawn.java b/Essentials/src/net/ess3/commands/Commandsetspawn.java
index ccf319892..45b942943 100644
--- a/Essentials/src/net/ess3/commands/Commandsetspawn.java
+++ b/Essentials/src/net/ess3/commands/Commandsetspawn.java
@@ -11,7 +11,7 @@ public class Commandsetspawn extends EssentialsCommand
 	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
 		final String group = args.length > 0 ? getFinalArg(args, 0) : "default";
-		((SpawnsHolder)module).setSpawn(user.getLocation(), group);
+		((SpawnsHolder)module).setSpawn(user.getPlayer().getLocation(), group);
 		user.sendMessage(_("spawnSet", group));
 	}
 }
diff --git a/Essentials/src/net/ess3/commands/Commandsetwarp.java b/Essentials/src/net/ess3/commands/Commandsetwarp.java
index 28c11940f..5f7401035 100644
--- a/Essentials/src/net/ess3/commands/Commandsetwarp.java
+++ b/Essentials/src/net/ess3/commands/Commandsetwarp.java
@@ -24,7 +24,7 @@ public class Commandsetwarp extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 
-		final Location loc = user.getLocation();
+		final Location loc = user.getPlayer().getLocation();
 		final IWarps warps = ess.getWarps();
 		Location warpLoc = null;
 
diff --git a/Essentials/src/net/ess3/commands/Commandsetworth.java b/Essentials/src/net/ess3/commands/Commandsetworth.java
index c7dc18303..92de472bc 100644
--- a/Essentials/src/net/ess3/commands/Commandsetworth.java
+++ b/Essentials/src/net/ess3/commands/Commandsetworth.java
@@ -22,7 +22,7 @@ public class Commandsetworth extends EssentialsCommand
 
 		if (args.length == 1)
 		{
-			stack = user.getInventory().getItemInHand();
+			stack = user.getPlayer().getInventory().getItemInHand();
 			price = args[0];
 		}
 		else
diff --git a/Essentials/src/net/ess3/commands/Commandspawn.java b/Essentials/src/net/ess3/commands/Commandspawn.java
index fb669d907..23b2bf5ef 100644
--- a/Essentials/src/net/ess3/commands/Commandspawn.java
+++ b/Essentials/src/net/ess3/commands/Commandspawn.java
@@ -23,7 +23,7 @@ public class Commandspawn extends EssentialsCommand
 			respawn(otherUser, null);
 			if (!otherUser.equals(user))
 			{
-				otherUser.sendMessage(_("teleportAtoB", user.getDisplayName(), "spawn"));
+				otherUser.sendMessage(_("teleportAtoB", user.getPlayer().getDisplayName(), "spawn"));
 				user.sendMessage(_("teleporting"));
 			}
 		}
@@ -42,7 +42,7 @@ public class Commandspawn extends EssentialsCommand
 		}
 		final IUser user = ess.getUserMap().matchUser(args[0], false, false);
 		respawn(user, null);
-		user.sendMessage(_("teleportAtoB", user.getDisplayName(), "spawn"));
+		user.sendMessage(_("teleportAtoB", user.getPlayer().getDisplayName(), "spawn"));
 		sender.sendMessage(_("teleporting"));
 	}
 
diff --git a/Essentials/src/net/ess3/commands/Commandspawnmob.java b/Essentials/src/net/ess3/commands/Commandspawnmob.java
index 0e4243586..b9b572dbb 100644
--- a/Essentials/src/net/ess3/commands/Commandspawnmob.java
+++ b/Essentials/src/net/ess3/commands/Commandspawnmob.java
@@ -244,7 +244,7 @@ public class Commandspawnmob extends EssentialsCommand
 		{
 			final Tameable tameable = ((Tameable)spawned);
 			tameable.setTamed(true);
-			tameable.setOwner(user.getBase());
+			tameable.setOwner(user.getPlayer());
 		}
 		if (type == EntityType.WOLF
 			&& data.contains("angry"))
@@ -279,21 +279,6 @@ public class Commandspawnmob extends EssentialsCommand
 					((Villager)spawned).setProfession(prof);
 				}
 			}
-		}
-		if (type == EntityType.OCELOT)
-		{
-			if (data.contains("siamese"))
-			{
-				((Ocelot)spawned).setCatType(Ocelot.Type.SIAMESE_CAT);
-			}
-			if (data.contains("red"))
-			{
-				((Ocelot)spawned).setCatType(Ocelot.Type.RED_CAT);
-			}
-			if (data.contains("black"))
-			{
-				((Ocelot)spawned).setCatType(Ocelot.Type.BLACK_CAT);
-			}
-		}
+		}		
 	}
 }
diff --git a/Essentials/src/net/ess3/commands/Commandsudo.java b/Essentials/src/net/ess3/commands/Commandsudo.java
index 7d2d8af37..58279c9ef 100644
--- a/Essentials/src/net/ess3/commands/Commandsudo.java
+++ b/Essentials/src/net/ess3/commands/Commandsudo.java
@@ -4,6 +4,7 @@ import static net.ess3.I18n._;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.PluginCommand;
 
 
 public class Commandsudo extends EssentialsCommand
@@ -29,13 +30,13 @@ public class Commandsudo extends EssentialsCommand
 			throw new Exception(_("sudoExempt"));
 		}
 
-		sender.sendMessage(_("sudoRun", user.getDisplayName(), command, getFinalArg(arguments, 0)));
+		sender.sendMessage(_("sudoRun", user.getPlayer().getDisplayName(), command, getFinalArg(arguments, 0)));
 
 		ess.getServer().dispatchCommand(user, command);
 		final PluginCommand execCommand = ess.getServer().getPluginCommand(command);
 		if (execCommand != null)
 		{
-			execCommand.execute(user.getBase(), command, arguments);
+			execCommand.execute(user.getPlayer(), command, arguments);
 		}
 
 	}
diff --git a/Essentials/src/net/ess3/commands/Commandsuicide.java b/Essentials/src/net/ess3/commands/Commandsuicide.java
index c9598ee3e..03f80bb25 100644
--- a/Essentials/src/net/ess3/commands/Commandsuicide.java
+++ b/Essentials/src/net/ess3/commands/Commandsuicide.java
@@ -9,10 +9,10 @@ public class Commandsuicide extends EssentialsCommand
 	@Override
 	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
-		ess.getPlugin().callSuicideEvent(user.getBase());
-		user.damage(Short.MAX_VALUE);
+		ess.getPlugin().callSuicideEvent(user.getPlayer());
+		user.getPlayer().damage(Short.MAX_VALUE);
 		user.sendMessage(_("suicideMessage"));
 		user.setDisplayNick();
-		ess.broadcastMessage(user,_("suicideSuccess", user.getDisplayName()));		
+		ess.broadcastMessage(user,_("suicideSuccess", user.getPlayer().getDisplayName()));		
 	}
 }
diff --git a/Essentials/src/net/ess3/commands/Commandtempban.java b/Essentials/src/net/ess3/commands/Commandtempban.java
index 783939c68..28febd4e6 100644
--- a/Essentials/src/net/ess3/commands/Commandtempban.java
+++ b/Essentials/src/net/ess3/commands/Commandtempban.java
@@ -45,7 +45,7 @@ public class Commandtempban extends EssentialsCommand
 		user.getData().getBan().setReason(banReason);
 		user.getData().getBan().setTimeout(banTimestamp);
 		user.setBanned(true);
-		user.kickPlayer(banReason);
+		user.getPlayer().kickPlayer(banReason);
 		final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
 
 		for (Player onlinePlayer : server.getOnlinePlayers())
diff --git a/Essentials/src/net/ess3/commands/Commandthunder.java b/Essentials/src/net/ess3/commands/Commandthunder.java
index eb7d9e1e2..5c2c472a0 100644
--- a/Essentials/src/net/ess3/commands/Commandthunder.java
+++ b/Essentials/src/net/ess3/commands/Commandthunder.java
@@ -15,7 +15,7 @@ public class Commandthunder extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 
-		final World world = user.getWorld();
+		final World world = user.getPlayer().getWorld();
 		final boolean setThunder = args[0].equalsIgnoreCase("true");
 		if (args.length > 1)
 		{
diff --git a/Essentials/src/net/ess3/commands/Commandtime.java b/Essentials/src/net/ess3/commands/Commandtime.java
index d24b1b6d7..378fa511f 100644
--- a/Essentials/src/net/ess3/commands/Commandtime.java
+++ b/Essentials/src/net/ess3/commands/Commandtime.java
@@ -129,7 +129,7 @@ public class Commandtime extends EssentialsCommand
 			}
 			else
 			{
-				worlds.add(user.getWorld());
+				worlds.add(user.getPlayer().getWorld());
 			}
 			return worlds;
 		}
diff --git a/Essentials/src/net/ess3/commands/Commandtop.java b/Essentials/src/net/ess3/commands/Commandtop.java
index c45ca0864..cf0e7b4f1 100644
--- a/Essentials/src/net/ess3/commands/Commandtop.java
+++ b/Essentials/src/net/ess3/commands/Commandtop.java
@@ -12,10 +12,10 @@ public class Commandtop extends EssentialsCommand
 	@Override
 	public void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
-		final int topX = user.getLocation().getBlockX();
-		final int topZ = user.getLocation().getBlockZ();
-		final int topY = user.getWorld().getHighestBlockYAt(topX, topZ);
-		user.getTeleport().teleport(new Location(user.getWorld(), user.getLocation().getX(), topY + 1, user.getLocation().getZ(), user.getLocation().getYaw(), user.getLocation().getPitch()), new Trade(commandName, ess), TeleportCause.COMMAND);
+		final int topX = user.getPlayer().getLocation().getBlockX();
+		final int topZ = user.getPlayer().getLocation().getBlockZ();
+		final int topY = user.getPlayer().getWorld().getHighestBlockYAt(topX, topZ);
+		user.getTeleport().teleport(new Location(user.getPlayer().getWorld(), user.getPlayer().getLocation().getX(), topY + 1, user.getPlayer().getLocation().getZ(), user.getPlayer().getLocation().getYaw(), user.getPlayer().getLocation().getPitch()), new Trade(commandName, ess), TeleportCause.COMMAND);
 		user.sendMessage(_("teleportTop"));
 	}
 }
diff --git a/Essentials/src/net/ess3/commands/Commandtp.java b/Essentials/src/net/ess3/commands/Commandtp.java
index b23695270..999b220e4 100644
--- a/Essentials/src/net/ess3/commands/Commandtp.java
+++ b/Essentials/src/net/ess3/commands/Commandtp.java
@@ -31,17 +31,17 @@ public class Commandtp extends EssentialsCommand
 			player.acquireReadLock();
 			if (!player.getData().isTeleportEnabled())
 			{
-				throw new Exception(_("teleportDisabled", player.getDisplayName()));
+				throw new Exception(_("teleportDisabled", player.getPlayer().getDisplayName()));
 			}
-			if (user.getWorld() != player.getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
-				&& !WorldPermissions.getPermission(player.getWorld().getName()).isAuthorized(user))
+			if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
+				&& !WorldPermissions.getPermission(player.getPlayer().getWorld().getName()).isAuthorized(user))
 			{
-				throw new Exception(_("noPerm", "essentials.world." + player.getWorld().getName()));
+				throw new Exception(_("noPerm", "essentials.world." + player.getPlayer().getWorld().getName()));
 			}
 			user.sendMessage(_("teleporting"));
 			final Trade charge = new Trade(commandName, ess);
 			charge.isAffordableFor(user);
-			user.getTeleport().teleport(player, charge, TeleportCause.COMMAND);
+			user.getTeleport().teleport(player.getPlayer(), charge, TeleportCause.COMMAND);
 			throw new NoChargeException();
 
 		default:
@@ -59,19 +59,19 @@ public class Commandtp extends EssentialsCommand
 
 			if (!target.getData().isTeleportEnabled())
 			{
-				throw new Exception(_("teleportDisabled", target.getDisplayName()));
+				throw new Exception(_("teleportDisabled", target.getPlayer().getDisplayName()));
 			}
 			if (!toPlayer.getData().isTeleportEnabled())
 			{
-				throw new Exception(_("teleportDisabled", toPlayer.getDisplayName()));
+				throw new Exception(_("teleportDisabled", toPlayer.getPlayer().getDisplayName()));
 			}
-			if (target.getWorld() != toPlayer.getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
-				&& !WorldPermissions.getPermission(toPlayer.getWorld().getName()).isAuthorized(user))
+			if (target.getPlayer().getWorld() != toPlayer.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
+				&& !WorldPermissions.getPermission(toPlayer.getPlayer().getWorld().getName()).isAuthorized(user))
 			{
-				throw new Exception(_("noPerm", "essentials.world." + toPlayer.getWorld().getName()));
+				throw new Exception(_("noPerm", "essentials.world." + toPlayer.getPlayer().getWorld().getName()));
 			}
-			target.getTeleport().now(toPlayer, false, TeleportCause.COMMAND);
-			target.sendMessage(_("teleportAtoB", user.getDisplayName(), toPlayer.getDisplayName()));
+			target.getTeleport().now(toPlayer.getPlayer(), false, TeleportCause.COMMAND);
+			target.sendMessage(_("teleportAtoB", user.getPlayer().getDisplayName(), toPlayer.getPlayer().getDisplayName()));
 			break;
 		}
 	}
@@ -85,9 +85,9 @@ public class Commandtp extends EssentialsCommand
 		}
 
 		sender.sendMessage(_("teleporting"));
-		final IUser target = getPlayer(args, 0);
-		final IUser toPlayer = getPlayer(args, 1);
-		target.getTeleport().now(toPlayer, false, TeleportCause.COMMAND);
-		target.sendMessage(_("teleportAtoB", Console.NAME, toPlayer.getDisplayName()));
+		final IUser target = ess.getUserMap().getUser(args[0]);
+		final IUser toPlayer =ess.getUserMap().getUser(args[1]);
+		target.getTeleport().now(toPlayer.getPlayer(), false, TeleportCause.COMMAND);
+		target.sendMessage(_("teleportAtoB", Console.NAME, toPlayer.getPlayer().getDisplayName()));
 	}
 }
diff --git a/Essentials/src/net/ess3/commands/Commandtpa.java b/Essentials/src/net/ess3/commands/Commandtpa.java
index db78e27e7..7429368ea 100644
--- a/Essentials/src/net/ess3/commands/Commandtpa.java
+++ b/Essentials/src/net/ess3/commands/Commandtpa.java
@@ -22,20 +22,20 @@ public class Commandtpa extends EssentialsCommand
 		player.acquireReadLock();
 		if (!player.getData().isTeleportEnabled())
 		{
-			throw new Exception(_("teleportDisabled", player.getDisplayName()));
+			throw new Exception(_("teleportDisabled", player.getPlayer().getDisplayName()));
 		}
 		@Cleanup
 		ISettings settings = ess.getSettings();
 		settings.acquireReadLock();
-		if (user.getWorld() != player.getWorld() && ess.getSettings().getData().getGeneral().isWorldTeleportPermissions()
-			&& !WorldPermissions.getPermission(user.getWorld().getName()).isAuthorized(user))
+		if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && ess.getSettings().getData().getGeneral().isWorldTeleportPermissions()
+			&& !WorldPermissions.getPermission(user.getPlayer().getWorld().getName()).isAuthorized(user))
 		{
-			throw new Exception(_("noPerm", "essentials.world." + player.getWorld().getName()));
+			throw new Exception(_("noPerm", "essentials.world." + player.getPlayer().getWorld().getName()));
 		}
 		if (!player.isIgnoringPlayer(user))
 		{
 			player.requestTeleport(user, false);
-			player.sendMessage(_("teleportRequest", user.getDisplayName()));
+			player.sendMessage(_("teleportRequest", user.getPlayer().getDisplayName()));
 			player.sendMessage(_("typeTpaccept"));
 			player.sendMessage(_("typeTpdeny"));
 			int tpaAcceptCancellation = 0;
@@ -45,6 +45,6 @@ public class Commandtpa extends EssentialsCommand
 				player.sendMessage(_("teleportRequestTimeoutInfo", tpaAcceptCancellation));
 			}
 		}
-		user.sendMessage(_("requestSent", player.getDisplayName()));
+		user.sendMessage(_("requestSent", player.getPlayer().getDisplayName()));
 	}
 }
diff --git a/Essentials/src/net/ess3/commands/Commandtpaall.java b/Essentials/src/net/ess3/commands/Commandtpaall.java
index 02306d64d..a510690a7 100644
--- a/Essentials/src/net/ess3/commands/Commandtpaall.java
+++ b/Essentials/src/net/ess3/commands/Commandtpaall.java
@@ -47,15 +47,15 @@ public class Commandtpaall extends EssentialsCommand
 			@Cleanup
 			ISettings settings = ess.getSettings();
 			settings.acquireReadLock();
-			if (user.getWorld() != player.getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
-				&& !WorldPermissions.getPermission(user.getWorld().getName()).isAuthorized(user))
+			if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
+				&& !WorldPermissions.getPermission(user.getPlayer().getWorld().getName()).isAuthorized(user))
 			{
 				continue;
 			}
 			try
 			{
 				player.requestTeleport(user, true);
-				player.sendMessage(_("teleportHereRequest", user.getDisplayName()));
+				player.sendMessage(_("teleportHereRequest", user.getPlayer().getDisplayName()));
 				player.sendMessage(_("typeTpaccept"));
 				int tpaAcceptCancellation = 0;
 				tpaAcceptCancellation = settings.getData().getCommands().getTpa().getTimeout();
diff --git a/Essentials/src/net/ess3/commands/Commandtpaccept.java b/Essentials/src/net/ess3/commands/Commandtpaccept.java
index f6cfff691..cace251d8 100644
--- a/Essentials/src/net/ess3/commands/Commandtpaccept.java
+++ b/Essentials/src/net/ess3/commands/Commandtpaccept.java
@@ -60,7 +60,7 @@ public class Commandtpaccept extends EssentialsCommand
 			charge.isAffordableFor(target);
 		}
 		user.sendMessage(_("requestAccepted"));
-		target.sendMessage(_("requestAcceptedFrom", user.getDisplayName()));
+		target.sendMessage(_("requestAcceptedFrom", user.getPlayer().getDisplayName()));
 
 		if (user.isTeleportRequestHere())
 		{
diff --git a/Essentials/src/net/ess3/commands/Commandtpahere.java b/Essentials/src/net/ess3/commands/Commandtpahere.java
index 6ae1c036a..f29c784a4 100644
--- a/Essentials/src/net/ess3/commands/Commandtpahere.java
+++ b/Essentials/src/net/ess3/commands/Commandtpahere.java
@@ -22,18 +22,18 @@ public class Commandtpahere extends EssentialsCommand
 		player.acquireReadLock();
 		if (!player.getData().isTeleportEnabled())
 		{
-			throw new Exception(_("teleportDisabled", player.getDisplayName()));
+			throw new Exception(_("teleportDisabled", player.getPlayer().getDisplayName()));
 		}
 		@Cleanup
 		ISettings settings = ess.getSettings();
 		settings.acquireReadLock();
-		if (user.getWorld() != player.getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
-			&& !WorldPermissions.getPermission(user.getWorld().getName()).isAuthorized(user))
+		if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
+			&& !WorldPermissions.getPermission(user.getPlayer().getWorld().getName()).isAuthorized(user))
 		{
-			throw new Exception(_("noPerm", "essentials.world." + user.getWorld().getName()));
+			throw new Exception(_("noPerm", "essentials.world." + user.getPlayer().getWorld().getName()));
 		}
 		player.requestTeleport(user, true);
-		player.sendMessage(_("teleportHereRequest", user.getDisplayName()));
+		player.sendMessage(_("teleportHereRequest", user.getPlayer().getDisplayName()));
 		player.sendMessage(_("typeTpaccept"));
 		int tpaAcceptCancellation = 0;
 		{
@@ -43,6 +43,6 @@ public class Commandtpahere extends EssentialsCommand
 		{
 			player.sendMessage(_("teleportRequestTimeoutInfo", tpaAcceptCancellation));
 		}
-		user.sendMessage(_("requestSent", player.getDisplayName()));
+		user.sendMessage(_("requestSent", player.getPlayer().getDisplayName()));
 	}
 }
diff --git a/Essentials/src/net/ess3/commands/Commandtpall.java b/Essentials/src/net/ess3/commands/Commandtpall.java
index 4c21f9cf8..aea8b1403 100644
--- a/Essentials/src/net/ess3/commands/Commandtpall.java
+++ b/Essentials/src/net/ess3/commands/Commandtpall.java
@@ -43,14 +43,14 @@ public class Commandtpall extends EssentialsCommand
 			ISettings settings = ess.getSettings();
 			settings.acquireReadLock();
 
-			if (user.getWorld() != player.getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
-				&& !WorldPermissions.getPermission(user.getWorld().getName()).isAuthorized(user))
+			if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
+				&& !WorldPermissions.getPermission(user.getPlayer().getWorld().getName()).isAuthorized(user))
 			{
 				continue;
 			}
 			try
 			{
-				player.getTeleport().now(user, false, TeleportCause.COMMAND);
+				player.getTeleport().now(user.getPlayer(), false, TeleportCause.COMMAND);
 			}
 			catch (Exception ex)
 			{
diff --git a/Essentials/src/net/ess3/commands/Commandtpdeny.java b/Essentials/src/net/ess3/commands/Commandtpdeny.java
index e7744939b..a494dc866 100644
--- a/Essentials/src/net/ess3/commands/Commandtpdeny.java
+++ b/Essentials/src/net/ess3/commands/Commandtpdeny.java
@@ -16,7 +16,7 @@ public class Commandtpdeny extends EssentialsCommand
 		}
 
 		user.sendMessage(_("requestDenied"));
-		player.sendMessage(_("requestDeniedFrom", user.getDisplayName()));
+		player.sendMessage(_("requestDeniedFrom", user.getPlayer().getDisplayName()));
 		user.requestTeleport(null, false);
 	}
 }
diff --git a/Essentials/src/net/ess3/commands/Commandtphere.java b/Essentials/src/net/ess3/commands/Commandtphere.java
index 545489ac3..31af0192e 100644
--- a/Essentials/src/net/ess3/commands/Commandtphere.java
+++ b/Essentials/src/net/ess3/commands/Commandtphere.java
@@ -17,9 +17,9 @@ public class Commandtphere extends EssentialsCommand
 		player.acquireReadLock();
 		if (!player.getData().isTeleportEnabled())
 		{
-			throw new Exception(_("teleportDisabled", player.getDisplayName()));
+			throw new Exception(_("teleportDisabled", player.getPlayer().getDisplayName()));
 		}
-		player.getTeleport().teleport(user, new Trade(commandName, ess), TeleportCause.COMMAND);
+		player.getTeleport().teleport(user.getPlayer(), new Trade(commandName, ess), TeleportCause.COMMAND);
 		user.sendMessage(_("teleporting"));
 		player.sendMessage(_("teleporting"));
 		throw new NoChargeException();
diff --git a/Essentials/src/net/ess3/commands/Commandtpo.java b/Essentials/src/net/ess3/commands/Commandtpo.java
index 9ffb9870d..ae6a9d5c4 100644
--- a/Essentials/src/net/ess3/commands/Commandtpo.java
+++ b/Essentials/src/net/ess3/commands/Commandtpo.java
@@ -27,7 +27,7 @@ public class Commandtpo extends EssentialsCommand
 		// Verify permission
 		if (!player.isHidden() || Permissions.TELEPORT_HIDDEN.isAuthorized(user))
 		{
-			user.getTeleport().now(player, false, TeleportCause.COMMAND);
+			user.getTeleport().now(player.getPlayer(), false, TeleportCause.COMMAND);
 			user.sendMessage(_("teleporting"));
 		}
 		else
diff --git a/Essentials/src/net/ess3/commands/Commandtpohere.java b/Essentials/src/net/ess3/commands/Commandtpohere.java
index 5fa76c640..6b198df4f 100644
--- a/Essentials/src/net/ess3/commands/Commandtpohere.java
+++ b/Essentials/src/net/ess3/commands/Commandtpohere.java
@@ -31,10 +31,10 @@ public class Commandtpohere extends EssentialsCommand
 		ISettings settings = ess.getSettings();
 		settings.acquireReadLock();
 		//todo - common method
-		if (user.getWorld() != player.getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
-			&& !WorldPermissions.getPermission(user.getWorld().getName()).isAuthorized(player))
+		if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
+			&& !WorldPermissions.getPermission(user.getPlayer().getWorld().getName()).isAuthorized(player))
 		{
-			throw new Exception(_("noPerm", "essentials.world." + user.getWorld().getName()));
+			throw new Exception(_("noPerm", "essentials.world." + user.getPlayer().getWorld().getName()));
 		}
 
 
diff --git a/Essentials/src/net/ess3/economy/Trade.java b/Essentials/src/net/ess3/economy/Trade.java
index c95b4f7ee..57ea5c268 100644
--- a/Essentials/src/net/ess3/economy/Trade.java
+++ b/Essentials/src/net/ess3/economy/Trade.java
@@ -1,7 +1,10 @@
 package net.ess3.economy;
 
+import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.text.DateFormat;
+import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
 import java.util.logging.Level;
@@ -12,13 +15,13 @@ import net.ess3.api.ChargeException;
 import net.ess3.api.IEssentials;
 import net.ess3.api.ISettings;
 import net.ess3.api.IUser;
+import net.ess3.craftbukkit.InventoryWorkaround;
 import net.ess3.permissions.NoCommandCostPermissions;
 import net.ess3.permissions.Permissions;
 import org.bukkit.Location;
 import org.bukkit.inventory.ItemStack;
 
 
-
 public class Trade
 {
 	private final transient String command;
@@ -74,7 +77,7 @@ public class Trade
 		}
 
 		if (getItemStack() != null
-			&& !user.getInventory().containsItem(true, true, itemStack))
+			&& InventoryWorkaround.containsItem(user.getPlayer().getInventory(), true, true, itemStack))
 		{
 			throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
 		}
@@ -92,7 +95,7 @@ public class Trade
 		}
 
 		if (exp != null && exp > 0
-			&& user.getTotalExperience() < exp)
+			&& user.getPlayer().getTotalExperience() < exp)
 		{
 			throw new ChargeException(_("notEnoughExperience"));
 		}
@@ -114,8 +117,8 @@ public class Trade
 		{
 			if (dropItems)
 			{
-				final Map<Integer, ItemStack> leftOver = user.getInventory().addItem(true, getItemStack());
-				final Location loc = user.getLocation();
+				final Map<Integer, ItemStack> leftOver = InventoryWorkaround.addItem(user.getPlayer().getInventory(), true, getItemStack());
+				final Location loc = user.getPlayer().getLocation();
 				for (ItemStack dropStack : leftOver.values())
 				{
 					final int maxStackSize = dropStack.getType().getMaxStackSize();
@@ -126,25 +129,25 @@ public class Trade
 					{
 						final ItemStack stack = dropStack.clone();
 						stack.setAmount(maxStackSize);
-						itemStacks[i] = user.getWorld().dropItem(loc, stack).getItemStack();
+						itemStacks[i] = user.getPlayer().getWorld().dropItem(loc, stack).getItemStack();
 					}
 					if (leftover > 0)
 					{
 						final ItemStack stack = dropStack.clone();
 						stack.setAmount(leftover);
-						itemStacks[stacks] = user.getWorld().dropItem(loc, stack).getItemStack();
+						itemStacks[stacks] = user.getPlayer().getWorld().dropItem(loc, stack).getItemStack();
 					}
 				}
 			}
 			else
 			{
-				success = user.getInventory().addAllItems(true, getItemStack());
+				success = InventoryWorkaround.addAllItems(user.getPlayer().getInventory(), true, getItemStack());
 			}
 			user.getPlayer().updateInventory();
 		}
 		if (getExperience() != null)
 		{
-			user.setTotalExperience(user.getTotalExperience() + getExperience());
+			user.getPlayer().setTotalExperience(user.getPlayer().getTotalExperience() + getExperience());
 		}
 		return success;
 	}
@@ -161,12 +164,12 @@ public class Trade
 		}
 		if (getItemStack() != null)
 		{
-			if (!user.getInventory().containsItem(true, true, itemStack))
+			if (!InventoryWorkaround.containsItem(user.getPlayer().getInventory(), true, true, itemStack))
 			{
 				throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
 			}
-			user.getInventory().removeItem(true, true, getItemStack());
-			user.updateInventory();
+			InventoryWorkaround.removeItem(user.getPlayer().getInventory() , true, true, getItemStack());
+			user.getPlayer().updateInventory();
 		}
 		if (command != null && !command.isEmpty()
 			&& !NoCommandCostPermissions.getPermission(command).isAuthorized(user))
@@ -183,12 +186,12 @@ public class Trade
 		}
 		if (getExperience() != null)
 		{
-			final int experience = user.getTotalExperience();
+			final int experience = user.getPlayer().getTotalExperience();
 			if (experience < getExperience() && getExperience() > 0)
 			{
 				throw new ChargeException(_("notEnoughExperience"));
 			}
-			user.setTotalExperience(experience - getExperience());
+			user.getPlayer().setTotalExperience(experience - getExperience());
 		}
 	}
 
diff --git a/Essentials/test/net/ess3/testserver/TestServer.java b/Essentials/test/net/ess3/testserver/TestServer.java
index 40b4cb217..38ed8eeee 100644
--- a/Essentials/test/net/ess3/testserver/TestServer.java
+++ b/Essentials/test/net/ess3/testserver/TestServer.java
@@ -3,10 +3,11 @@ package net.ess3.testserver;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import net.ess3.api.server.CommandSender;
-import net.ess3.api.server.Player;
-import net.ess3.api.server.Server;
-import net.ess3.api.server.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.bukkit.command.ConsoleCommandSender;
 
 public class TestServer implements Server {
 
@@ -45,19 +46,19 @@ public class TestServer implements Server {
 	}
 
 	@Override
-	public Collection<Player> getOnlinePlayers()
+	public Player[] getOnlinePlayers()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
 	@Override
-	public CommandSender getConsoleSender()
+	public ConsoleCommandSender getConsoleSender()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
 	@Override
-	public void dispatchCommand(CommandSender sender, String command)
+	public boolean dispatchCommand(CommandSender sender, String command)
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
 	}
@@ -69,12 +70,6 @@ public class TestServer implements Server {
 	}
 
 	@Override
-	public <T> T getServiceProvider(Class<T> clazz)
-	{
-		throw new UnsupportedOperationException("Not supported yet.");
-	}
-
-	@Override
 	public String getVersion()
 	{
 		throw new UnsupportedOperationException("Not supported yet.");
diff --git a/Essentials/test/net/ess3/testserver/TestWorld.java b/Essentials/test/net/ess3/testserver/TestWorld.java
index ce258004d..6efc082bb 100644
--- a/Essentials/test/net/ess3/testserver/TestWorld.java
+++ b/Essentials/test/net/ess3/testserver/TestWorld.java
@@ -1,9 +1,9 @@
 package net.ess3.testserver;
 
 import java.util.UUID;
-import net.ess3.api.server.ItemStack;
-import net.ess3.api.server.Location;
-import net.ess3.api.server.World;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.Location;
+import org.bukkit.World;
 import org.bukkit.TreeType;
 
 public class TestWorld implements World {