diff --git a/src/main/java/com/minelittlepony/unicopia/power/PowerFeed.java b/src/main/java/com/minelittlepony/unicopia/power/PowerFeed.java index d15450b8..99300dbd 100644 --- a/src/main/java/com/minelittlepony/unicopia/power/PowerFeed.java +++ b/src/main/java/com/minelittlepony/unicopia/power/PowerFeed.java @@ -41,12 +41,12 @@ public class PowerFeed implements IPower { @Override public int getWarmupTime(IPlayer player) { - return 20; + return 5; } @Override public int getCooldownTime(IPlayer player) { - return 50; + return canFeed(player) ? 15 : 80; } @Override @@ -57,7 +57,7 @@ public class PowerFeed implements IPower { @Nullable @Override public Hit tryActivate(IPlayer player) { - if (player.getOwner().getHealth() < player.getOwner().getMaxHealth() || player.getOwner().canEat(false)) { + if (canFeed(player)) { if (!getTargets(player).isEmpty()) { return new Hit(); } @@ -66,6 +66,10 @@ public class PowerFeed implements IPower { return null; } + private boolean canFeed(IPlayer player) { + return player.getOwner().getHealth() < player.getOwner().getMaxHealth() || player.getOwner().canEat(false); + } + private boolean canDrain(Entity e) { return (e instanceof EntityLivingBase) && (e instanceof EntityCow