PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-20 19:34:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bows shooting off into space https://www.youtube.com/watch?v=7dwLCHNdqWw

Browse source
This commit is contained in:
Sollace 2018-04-30 17:27:21 +02:00
parent e0732a14d6
commit 4513f1c443
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/com/minelittlepony/model/AbstractPonyModel.java
View file

@ -371,17 +371,16 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
} }
protected void aimBow(ArmPose leftArm, ArmPose rightArm, float tick) { protected void aimBow(ArmPose leftArm, ArmPose rightArm, float tick) {
if (rightArm == ArmPose.BOW_AND_ARROW) aimBowPony(bipedRightArm, tick, false); if (rightArm == ArmPose.BOW_AND_ARROW) aimBowPony(bipedRightArm, tick);
if (leftArm == ArmPose.BOW_AND_ARROW) aimBowPony(bipedLeftArm, tick, false); 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.rotateAngleZ = 0;
arm.rotateAngleY = bipedHead.rotateAngleY - 0.06F; arm.rotateAngleY = bipedHead.rotateAngleY - 0.06F;
arm.rotateAngleX = ROTATE_270 + bipedHead.rotateAngleX; arm.rotateAngleX = ROTATE_270 + bipedHead.rotateAngleX;
arm.rotateAngleZ += MathHelper.cos(tick * 0.09F) * 0.05F + 0.05F; arm.rotateAngleZ += MathHelper.cos(tick * 0.09F) * 0.05F + 0.05F;
arm.rotateAngleX += MathHelper.sin(tick * 0.067F) * 0.05F; arm.rotateAngleX += MathHelper.sin(tick * 0.067F) * 0.05F;
if (shift) AbstractPonyRenderer.shiftRotationPoint(arm, 0, 0, 1);
} }
protected void fixSpecialRotationPoints(float move) { protected void fixSpecialRotationPoints(float move) {

4
src/main/java/com/minelittlepony/model/player/ModelAlicorn.java
View file

@ -126,8 +126,8 @@ public class ModelAlicorn extends ModelPegasus implements IModelUnicorn {
@Override @Override
protected void aimBow(ArmPose leftArm, ArmPose rightArm, float tick) { protected void aimBow(ArmPose leftArm, ArmPose rightArm, float tick) {
if (canCast()) { if (canCast()) {
if (rightArm == ArmPose.BOW_AND_ARROW) aimBowPony(unicornArmRight, tick, true); if (rightArm == ArmPose.BOW_AND_ARROW) aimBowPony(unicornArmRight, tick);
if (leftArm == ArmPose.BOW_AND_ARROW) aimBowPony(unicornArmLeft, tick, false); if (leftArm == ArmPose.BOW_AND_ARROW) aimBowPony(unicornArmLeft, tick);
} else { } else {
super.aimBow(leftArm, rightArm, tick); super.aimBow(leftArm, rightArm, tick);
} }