From 4513f1c443c946b583cd75129d1946d0092b2b3e Mon Sep 17 00:00:00 2001 From: Sollace Date: Mon, 30 Apr 2018 17:27:21 +0200 Subject: [PATCH] Fixed bows shooting off into space https://www.youtube.com/watch?v=7dwLCHNdqWw --- .../java/com/minelittlepony/model/AbstractPonyModel.java | 7 +++---- .../java/com/minelittlepony/model/player/ModelAlicorn.java | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java index 0decb91d..56479dd9 100644 --- a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java @@ -371,17 +371,16 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel { } protected void aimBow(ArmPose leftArm, ArmPose rightArm, float tick) { - if (rightArm == ArmPose.BOW_AND_ARROW) aimBowPony(bipedRightArm, tick, false); - if (leftArm == ArmPose.BOW_AND_ARROW) aimBowPony(bipedLeftArm, tick, false); + if (rightArm == ArmPose.BOW_AND_ARROW) aimBowPony(bipedRightArm, tick); + if (leftArm == ArmPose.BOW_AND_ARROW) aimBowPony(bipedLeftArm, tick); } - protected void aimBowPony(ModelRenderer arm, float tick, boolean shift) { + protected void aimBowPony(ModelRenderer arm, float tick) { arm.rotateAngleZ = 0; arm.rotateAngleY = bipedHead.rotateAngleY - 0.06F; arm.rotateAngleX = ROTATE_270 + bipedHead.rotateAngleX; arm.rotateAngleZ += MathHelper.cos(tick * 0.09F) * 0.05F + 0.05F; arm.rotateAngleX += MathHelper.sin(tick * 0.067F) * 0.05F; - if (shift) AbstractPonyRenderer.shiftRotationPoint(arm, 0, 0, 1); } protected void fixSpecialRotationPoints(float move) { diff --git a/src/main/java/com/minelittlepony/model/player/ModelAlicorn.java b/src/main/java/com/minelittlepony/model/player/ModelAlicorn.java index 610e274c..a39f49f9 100644 --- a/src/main/java/com/minelittlepony/model/player/ModelAlicorn.java +++ b/src/main/java/com/minelittlepony/model/player/ModelAlicorn.java @@ -126,8 +126,8 @@ public class ModelAlicorn extends ModelPegasus implements IModelUnicorn { @Override protected void aimBow(ArmPose leftArm, ArmPose rightArm, float tick) { if (canCast()) { - if (rightArm == ArmPose.BOW_AND_ARROW) aimBowPony(unicornArmRight, tick, true); - if (leftArm == ArmPose.BOW_AND_ARROW) aimBowPony(unicornArmLeft, tick, false); + if (rightArm == ArmPose.BOW_AND_ARROW) aimBowPony(unicornArmRight, tick); + if (leftArm == ArmPose.BOW_AND_ARROW) aimBowPony(unicornArmLeft, tick); } else { super.aimBow(leftArm, rightArm, tick); }