PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-12-03 17:28:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed unicorns not swinging their arms when their hands are empty

Browse source
This commit is contained in:
Sollace 2018-04-30 10:31:14 +02:00
parent 3a8ac047b1
commit 51e5c9ddc5
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -293,8 +293,6 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
if (swingProgress > -9990.0F && !isSleeping) { if (swingProgress > -9990.0F && !isSleeping) {
EnumHandSide mainSide = getMainHand(entity); EnumHandSide mainSide = getMainHand(entity);
if (getArmPoseForSide(mainSide) == ArmPose.EMPTY) return;
swingArm(getArmForSide(mainSide)); swingArm(getArmForSide(mainSide));
} }
} }

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

@ -63,11 +63,10 @@ public class ModelAlicorn extends ModelPegasus implements IModelUnicorn {
@Override @Override
protected void swingItem(Entity entity, float swingProgress) { protected void swingItem(Entity entity, float swingProgress) {
if (canCast()) { EnumHandSide mainSide = getMainHand(entity);
if (swingProgress > -9990.0F && !isSleeping) {
EnumHandSide mainSide = getMainHand(entity);
if (getArmPoseForSide(mainSide) == ArmPose.EMPTY) return; if (canCast() && getArmPoseForSide(mainSide) != ArmPose.EMPTY) {
if (swingProgress > -9990.0F && !isSleeping) {
swingArm(getUnicornArmForSide(mainSide)); swingArm(getUnicornArmForSide(mainSide));
} }
} else { } else {