41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
--- a/net/minecraft/world/entity/animal/camel/Camel.java
|
|
+++ b/net/minecraft/world/entity/animal/camel/Camel.java
|
|
@@ -55,6 +55,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;
|
|
@@ -153,7 +157,7 @@
|
|
GameProfilerFiller gameprofilerfiller = Profiler.get();
|
|
|
|
gameprofilerfiller.push("camelBrain");
|
|
- BehaviorController<?> behaviorcontroller = this.getBrain();
|
|
+ BehaviorController<Camel> behaviorcontroller = (BehaviorController<Camel>) this.getBrain(); // CraftBukkit - decompile error
|
|
|
|
behaviorcontroller.tick(worldserver, this);
|
|
gameprofilerfiller.pop();
|
|
@@ -464,9 +468,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
|