diff --git a/src/main/java/com/minelittlepony/model/player/ModelZebra.java b/src/main/java/com/minelittlepony/model/player/ModelZebra.java index 5955c2cf..53edb567 100644 --- a/src/main/java/com/minelittlepony/model/player/ModelZebra.java +++ b/src/main/java/com/minelittlepony/model/player/ModelZebra.java @@ -3,6 +3,8 @@ package com.minelittlepony.model.player; import net.minecraft.client.renderer.GlStateManager; import com.minelittlepony.model.BodyPart; +import com.minelittlepony.model.armour.ModelPonyArmor; +import com.minelittlepony.model.armour.PonyArmor; import com.minelittlepony.render.model.PonyRenderer; public class ModelZebra extends ModelEarthPony { @@ -13,6 +15,11 @@ public class ModelZebra extends ModelEarthPony { super(useSmallArms); } + @Override + public PonyArmor createArmour() { + return new PonyArmor(new Armour(), new Armour()); + } + @Override public void transform(BodyPart part) { if (part == BodyPart.HEAD || part == BodyPart.NECK) { @@ -41,4 +48,18 @@ public class ModelZebra extends ModelEarthPony { .box(0, -8, 6, 2, 6, 2, stretch) .rotateAngleX = -1F; } + + class Armour extends ModelPonyArmor { + + @Override + public void transform(BodyPart part) { + if (part == BodyPart.HEAD || part == BodyPart.NECK) { + GlStateManager.translate(0, -0.1F, 0); + } + if (part == BodyPart.NECK) { + GlStateManager.scale(1, 1.3F, 1); + } + super.transform(part); + } + } } diff --git a/src/main/java/com/minelittlepony/pony/data/PonyData.java b/src/main/java/com/minelittlepony/pony/data/PonyData.java index 269ed4e2..78492b63 100644 --- a/src/main/java/com/minelittlepony/pony/data/PonyData.java +++ b/src/main/java/com/minelittlepony/pony/data/PonyData.java @@ -71,7 +71,7 @@ public class PonyData implements IPonyData { @Override public boolean hasMagic() { - return race != null && getRace().getEffectiveRace(false).hasHorn() && getGlowColor() != 0; + return getRace() != null && getRace().getEffectiveRace(false).hasHorn() && getGlowColor() != 0; } @Override