30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
--- a/net/minecraft/world/entity/animal/camel/Camel.java
|
|
+++ b/net/minecraft/world/entity/animal/camel/Camel.java
|
|
@@ -150,7 +150,7 @@
|
|
@Override
|
|
protected void customServerAiStep() {
|
|
this.level().getProfiler().push("camelBrain");
|
|
- BehaviorController<?> behaviorcontroller = this.getBrain();
|
|
+ BehaviorController<Camel> behaviorcontroller = (BehaviorController<Camel>) this.getBrain(); // CraftBukkit - decompile error
|
|
|
|
behaviorcontroller.tick((WorldServer) this.level(), this);
|
|
this.level().getProfiler().pop();
|
|
@@ -462,9 +462,15 @@
|
|
}
|
|
|
|
@Override
|
|
- protected void actuallyHurt(DamageSource damagesource, float f) {
|
|
+ // CraftBukkit start - void -> float, returned value means the final damage
|
|
+ protected float actuallyHurt(final DamageSource damagesource, float f) {
|
|
+ float hurt = super.actuallyHurt(damagesource, f);
|
|
+ if (hurt <= 0) {
|
|
+ return hurt;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.standUpInstantly();
|
|
- super.actuallyHurt(damagesource, f);
|
|
+ return hurt; // CraftBukkit
|
|
}
|
|
|
|
@Override
|