Didn't mean to commit that

This commit is contained in:
Sollace 2018-09-07 21:20:35 +02:00
parent fa7417f87b
commit 2fc4dcae90

View file

@ -3,11 +3,11 @@ package com.minelittlepony.model.armour;
import com.minelittlepony.model.capabilities.IModelWrapper; import com.minelittlepony.model.capabilities.IModelWrapper;
import com.minelittlepony.pony.data.IPonyData; import com.minelittlepony.pony.data.IPonyData;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public class PonyArmor implements IModelWrapper, IEquestrianArmor { public class PonyArmor implements IModelWrapper, IEquestrianArmor {
public ModelPonyArmor outerLayer;
public ModelPonyArmor innerLayer;
public PonyArmor(ModelPonyArmor outer, ModelPonyArmor inner) { public PonyArmor(ModelPonyArmor outer, ModelPonyArmor inner) {
outerLayer = outer; outerLayer = outer;
innerLayer = inner; innerLayer = inner;
@ -25,20 +25,13 @@ public class PonyArmor implements IModelWrapper, IEquestrianArmor {
innerLayer.init(0, 0.5F); innerLayer.init(0, 0.5F);
} }
@Override
public ModelPonyArmor getArmorForLayer(ArmorLayer layer) {
@Nullable if (layer == ArmorLayer.INNER) {
public ModelPonyArmor outerLayer;
@Nullable
public ModelPonyArmor innerLayer;
@Override @Nonnull
public ModelPonyArmor getArmorForLayer(@Nullable ArmorLayer layer) {
if (layer.ordinal() == ArmorLayer.INNER.ordinal()) {
return innerLayer; return innerLayer;
} }
return null; return outerLayer;
} }
} }