From 101b2bd20cd1552aefca8e0b424c518f44e7f690 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 5 Oct 2023 20:04:55 +0100 Subject: [PATCH] Fixed mobs' arms sticking too far up when sitting in a boat # Conflicts: # src/main/java/com/minelittlepony/client/model/IMobModel.java --- .../com/minelittlepony/client/model/AbstractPonyModel.java | 1 + .../java/com/minelittlepony/client/model/IMobModel.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java index 8aca7121..aea6fd80 100644 --- a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java @@ -366,6 +366,7 @@ public abstract class AbstractPonyModel extends ClientPo case NECK: return neck; case TAIL: case LEGS: + case BACK: case BODY: return body; } } diff --git a/src/main/java/com/minelittlepony/client/model/IMobModel.java b/src/main/java/com/minelittlepony/client/model/IMobModel.java index 5d570ac2..6e9450df 100644 --- a/src/main/java/com/minelittlepony/client/model/IMobModel.java +++ b/src/main/java/com/minelittlepony/client/model/IMobModel.java @@ -39,9 +39,15 @@ public interface IMobModel { if (islookAngleRight(move)) { IMobModel.rotateArmHolding(rightArm, 1, model.getSwingAmount(), ticks); + if (model.getAttributes().isSitting) { + rightArm.pitch += 0.6F; + } PartUtil.shift(rightArm, 0.5F, 1.5F, 3); } else { IMobModel.rotateArmHolding(leftArm, -1, model.getSwingAmount(), ticks); + if (model.getAttributes().isSitting) { + leftArm.pitch += 0.6F; + } PartUtil.shift(leftArm, -0.5F, 1.5F, 3); } }