From 3f5e2ad85ab95f741700a8126d5f917a9cc0014c Mon Sep 17 00:00:00 2001
From: KHobbits <rob@khobbits.co.uk>
Date: Sun, 7 Jul 2013 11:40:20 +0100
Subject: [PATCH] Whoops, we shouldn't be leaking the user object.

---
 Essentials/src/com/earth2me/essentials/Mob.java              | 5 -----
 .../src/com/earth2me/essentials/commands/Commandfeed.java    | 2 +-
 .../src/com/earth2me/essentials/commands/Commandheal.java    | 2 +-
 .../com/earth2me/essentials/commands/Commandkittycannon.java | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Essentials/src/com/earth2me/essentials/Mob.java b/Essentials/src/com/earth2me/essentials/Mob.java
index 4af62d37f..370d4a681 100644
--- a/Essentials/src/com/earth2me/essentials/Mob.java
+++ b/Essentials/src/com/earth2me/essentials/Mob.java
@@ -91,11 +91,6 @@ public enum Mob
 		return Collections.unmodifiableSet(hashMap.keySet());
 	}
 
-	public Entity spawn(final Player player, final Server server, final Location loc) throws MobException
-	{
-		return spawn(player.getWorld(), server, loc);
-	}
-
 	public Entity spawn(final World world, final Server server, final Location loc) throws MobException
 	{
 		final Entity entity = world.spawn(loc, (Class<? extends Entity>)this.bukkitType.getEntityClass());
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java b/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java
index f73e43a25..6f11fd8b5 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java
@@ -39,7 +39,7 @@ public class Commandfeed extends EssentialsCommand
 		}
 		try
 		{
-			feedPlayer(user, user);
+			feedPlayer(user, user.getBase());
 		}
 		catch (QuietAbortException e)
 		{
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandheal.java b/Essentials/src/com/earth2me/essentials/commands/Commandheal.java
index 52816ba4a..02f6de186 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandheal.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandheal.java
@@ -40,7 +40,7 @@ public class Commandheal extends EssentialsCommand
 		{
 			user.healCooldown();
 		}
-		healPlayer(user);
+		healPlayer(user.getBase());
 	}
 
 	@Override
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkittycannon.java b/Essentials/src/com/earth2me/essentials/commands/Commandkittycannon.java
index da2223570..c5e8bc995 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandkittycannon.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandkittycannon.java
@@ -21,7 +21,7 @@ public class Commandkittycannon extends EssentialsCommand
 	protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
 		final Mob cat = Mob.OCELOT;
-		final Ocelot ocelot = (Ocelot)cat.spawn(user, server, user.getEyeLocation());
+		final Ocelot ocelot = (Ocelot)cat.spawn(user.getWorld(), server, user.getEyeLocation());
 		if (ocelot == null)
 		{
 			return;