From 8feb98a756448142612aadf7742d76014de2849b Mon Sep 17 00:00:00 2001 From: Matthew Messinger Date: Mon, 28 Dec 2015 20:52:58 -0500 Subject: [PATCH] Fix mob armor being messed up --- .../java/com/brohoof/minelittlepony/model/PlayerModel.java | 1 + .../model/pony/armor/ModelSkeletonPonyArmor.java | 4 ---- .../minelittlepony/model/pony/armor/ModelZombiePonyArmor.java | 4 ---- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/com/brohoof/minelittlepony/model/PlayerModel.java b/src/main/java/com/brohoof/minelittlepony/model/PlayerModel.java index 9eb7f121..77d11e64 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/PlayerModel.java +++ b/src/main/java/com/brohoof/minelittlepony/model/PlayerModel.java @@ -23,6 +23,7 @@ public class PlayerModel { public PlayerModel setArmor(AbstractArmor armor) { this.armor = armor; + this.armor.apply(model.metadata); return this; } diff --git a/src/main/java/com/brohoof/minelittlepony/model/pony/armor/ModelSkeletonPonyArmor.java b/src/main/java/com/brohoof/minelittlepony/model/pony/armor/ModelSkeletonPonyArmor.java index 47dc888a..6cd3cfcf 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/pony/armor/ModelSkeletonPonyArmor.java +++ b/src/main/java/com/brohoof/minelittlepony/model/pony/armor/ModelSkeletonPonyArmor.java @@ -34,13 +34,9 @@ public class ModelSkeletonPonyArmor extends ModelPonyArmor { this.bipedLeftLeg.rotateAngleY = 0.2F; } else { var8 = (float) Math.pow(swing, 16.0D); - this.getClass(); var9 = 3.1415927F * var8 * 0.5F; - this.getClass(); float laQuad = 3.1415927F * var8; - this.getClass(); float rlQuad = 3.1415927F * var8 * 0.2F; - this.getClass(); float llQuad = 3.1415927F * var8 * -0.4F; rightArmRotateAngleX = MathHelper.cos(move * 0.6662F + 3.1415927F + var9) * 0.6F * swing; leftArmRotateAngleX = MathHelper.cos(move * 0.6662F + laQuad) * 0.6F * swing; diff --git a/src/main/java/com/brohoof/minelittlepony/model/pony/armor/ModelZombiePonyArmor.java b/src/main/java/com/brohoof/minelittlepony/model/pony/armor/ModelZombiePonyArmor.java index 2464f3e1..106d5819 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/pony/armor/ModelZombiePonyArmor.java +++ b/src/main/java/com/brohoof/minelittlepony/model/pony/armor/ModelZombiePonyArmor.java @@ -34,13 +34,9 @@ public class ModelZombiePonyArmor extends ModelPonyArmor { this.bipedLeftLeg.rotateAngleY = 0.2F; } else { var8 = (float) Math.pow(swing, 16.0D); - this.getClass(); var9 = 3.1415927F * var8 * 0.5F; - this.getClass(); float laQuad = 3.1415927F * var8; - this.getClass(); float rlQuad = 3.1415927F * var8 * 0.2F; - this.getClass(); float llQuad = 3.1415927F * var8 * -0.4F; rightArmRotateAngleX = MathHelper.cos(move * 0.6662F + 3.1415927F + var9) * 0.45F * swing; leftArmRotateAngleX = MathHelper.cos(move * 0.6662F + laQuad) * 0.45F * swing;