--- a/net/minecraft/world/entity/animal/camel/Camel.java +++ b/net/minecraft/world/entity/animal/camel/Camel.java @@ -50,6 +50,10 @@ import net.minecraft.world.phys.Vec2F; import net.minecraft.world.phys.Vec3D; +// CraftBukkit start +import org.bukkit.event.entity.EntityDamageEvent; +// CraftBukkit end + public class Camel extends EntityHorseAbstract { public static final float BABY_SCALE = 0.45F; @@ -143,7 +147,7 @@ GameProfilerFiller gameprofilerfiller = Profiler.get(); gameprofilerfiller.push("camelBrain"); - BehaviorController behaviorcontroller = this.getBrain(); + BehaviorController behaviorcontroller = (BehaviorController) this.getBrain(); // CraftBukkit - decompile error behaviorcontroller.tick(worldserver, this); gameprofilerfiller.pop(); @@ -454,9 +458,15 @@ } @Override - protected void actuallyHurt(WorldServer worldserver, DamageSource damagesource, float f) { + // CraftBukkit start - void -> boolean + public boolean actuallyHurt(WorldServer worldserver, DamageSource damagesource, float f, EntityDamageEvent event) { + boolean damageResult = super.actuallyHurt(worldserver, damagesource, f, event); + if (!damageResult) { + return false; + } + // CraftBukkit end this.standUpInstantly(); - super.actuallyHurt(worldserver, damagesource, f); + return true; // CraftBukkit } @Override