summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-04-16 21:43:19 +0100
committerKHobbits <rob@khobbits.co.uk>2012-04-16 21:43:19 +0100
commit3157a279aa1db4c5f41c6872f8320fdb5049a1ce (patch)
treea6e3930626db0a6e3d49e6a06e6c2192dbfec082
parentfe937ec5b2de6b8b18d642699d632a3b6e18c20b (diff)
parentfcccd212e4251169978037d0e32b76aca2242e1e (diff)
downloadEssentials-3157a279aa1db4c5f41c6872f8320fdb5049a1ce.tar
Essentials-3157a279aa1db4c5f41c6872f8320fdb5049a1ce.tar.gz
Essentials-3157a279aa1db4c5f41c6872f8320fdb5049a1ce.tar.lz
Essentials-3157a279aa1db4c5f41c6872f8320fdb5049a1ce.tar.xz
Essentials-3157a279aa1db4c5f41c6872f8320fdb5049a1ce.zip
Merge branch 'master' of github.com:essentials/Essentials
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
index 829ef0313..9c8fa0707 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
@@ -62,7 +62,7 @@ public class EssentialsEntityListener implements Listener
}
else if (eDefend instanceof Animals && eAttack instanceof Player)
{
- final User player = ess.getUser(eAttack);
+ final Player player = (Player)eAttack;
final ItemStack hand = player.getItemInHand();
if (hand != null && hand.getType() == Material.MILK_BUCKET)
{