From ee685bd2ac8dd7220dfea8526411da000b8ec1c8 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 3 Mar 2024 11:30:57 +1100 Subject: [PATCH] Fix Camel not standing up when hurt --- .../world/entity/animal/camel/Camel.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 nms-patches/net/minecraft/world/entity/animal/camel/Camel.patch diff --git a/nms-patches/net/minecraft/world/entity/animal/camel/Camel.patch b/nms-patches/net/minecraft/world/entity/animal/camel/Camel.patch new file mode 100644 index 000000000..9fe414704 --- /dev/null +++ b/nms-patches/net/minecraft/world/entity/animal/camel/Camel.patch @@ -0,0 +1,29 @@ +--- 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 behaviorcontroller = (BehaviorController) 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 -> boolean ++ protected boolean actuallyHurt(DamageSource damagesource, float f) { ++ boolean hurt = super.actuallyHurt(damagesource, f); ++ if (!hurt) { ++ return hurt; ++ } ++ // CraftBukkit end + this.standUpInstantly(); +- super.actuallyHurt(damagesource, f); ++ return hurt; // CraftBukkit + } + + @Override