From af3dff6c87bdf30f9e72f11dbd12175646d126ca Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 26 Apr 2018 17:20:40 +0200 Subject: [PATCH] Fix errors when rendering armour --- .../minelittlepony/model/ponies/ModelPlayerPony.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelPlayerPony.java b/src/main/java/com/minelittlepony/model/ponies/ModelPlayerPony.java index 3eda4fc2..bce9ffde 100644 --- a/src/main/java/com/minelittlepony/model/ponies/ModelPlayerPony.java +++ b/src/main/java/com/minelittlepony/model/ponies/ModelPlayerPony.java @@ -107,10 +107,12 @@ public class ModelPlayerPony extends AbstractPonyModel { animateWears(); - bipedCape.rotationPointY = isSneak ? 2 : isRiding ? -4 : 0; - - snout.setGender(metadata.getGender()); - wings.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scaleFactor, entityIn); + if (bipedCape != null) { + bipedCape.rotationPointY = isSneak ? 2 : isRiding ? -4 : 0; + + snout.setGender(metadata.getGender()); + wings.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scaleFactor, entityIn); + } } protected void adjustBodyRiding() { @@ -456,7 +458,6 @@ public class ModelPlayerPony extends AbstractPonyModel { pushMatrix(); transform(BodyPart.BODY); renderBody(entityIn, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale); - tail.render(metadata.getTail(), scale); popMatrix(); pushMatrix(); @@ -485,6 +486,7 @@ public class ModelPlayerPony extends AbstractPonyModel { upperTorso.render(scale); bipedBody.postRender(scale); wings.render(entityIn, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale); + tail.render(metadata.getTail(), scale); } protected void renderLegs() {