From 7793dc003f555d80b53c9158ccc45ba1a0238507 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 13 Jul 2019 23:57:05 +0200 Subject: [PATCH] We don't need to override holdItem for unicorns --- .../client/model/AbstractPonyModel.java | 4 ++-- .../client/model/races/ModelUnicorn.java | 12 ------------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java index 9f513caa..ad254c60 100644 --- a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java @@ -364,8 +364,8 @@ public abstract class AbstractPonyModel extends ClientPo protected void holdItem(float swing) { boolean both = leftArmPose == ArmPose.ITEM && rightArmPose == ArmPose.ITEM; - alignArmForAction(leftArm, leftArmPose, rightArmPose, both, swing, 1); - alignArmForAction(rightArm, rightArmPose, leftArmPose, both, swing, -1); + alignArmForAction(getArm(AbsoluteHand.LEFT), leftArmPose, rightArmPose, both, swing, 1); + alignArmForAction(getArm(AbsoluteHand.RIGHT), rightArmPose, leftArmPose, both, swing, -1); } @Override diff --git a/src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java b/src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java index 7fcf42f4..b4fbced7 100644 --- a/src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java +++ b/src/main/java/com/minelittlepony/client/model/races/ModelUnicorn.java @@ -45,18 +45,6 @@ public class ModelUnicorn extends ModelEarthPony impl unicornArmLeft.rotate(0, 0, 0).around(-7, 12, -2); } - @Override - protected void holdItem(float swing) { - if (canCast()) { - boolean both = leftArmPose == ArmPose.ITEM && rightArmPose == ArmPose.ITEM; - - alignArmForAction(unicornArmLeft, leftArmPose, rightArmPose, both, swing, 1); - alignArmForAction(unicornArmRight, rightArmPose, leftArmPose, both, swing, -1); - } else { - super.holdItem(swing); - } - } - public ArmPose getArmPoseForSide(AbsoluteHand side) { return side == AbsoluteHand.RIGHT ? rightArmPose : leftArmPose; }