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
commit425a2184c68fa0c25b21f0e26db4db8c29da886f (patch)
tree9c0e0ddb7fda564c086e53e820997cb9f1fa4066
parent6919b52f615178566fbb336ade6cddd4da1f75e3 (diff)
parent8eb7428ad1acd923a3ccf5a6aafc2200a636fc55 (diff)
downloadEssentials-425a2184c68fa0c25b21f0e26db4db8c29da886f.tar
Essentials-425a2184c68fa0c25b21f0e26db4db8c29da886f.tar.gz
Essentials-425a2184c68fa0c25b21f0e26db4db8c29da886f.tar.lz
Essentials-425a2184c68fa0c25b21f0e26db4db8c29da886f.tar.xz
Essentials-425a2184c68fa0c25b21f0e26db4db8c29da886f.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)
{