PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-26 22:38:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "We are the pony now"

Browse source 
This reverts commit c6275cf98b.
This commit is contained in:
Sollace 2018-10-29 15:16:42 +02:00
parent c6275cf98b
commit 2c36c99bba
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,6 @@ package com.minelittlepony.model;
import com.minelittlepony.model.armour.ModelPonyArmor; import com.minelittlepony.model.armour.ModelPonyArmor;
import com.minelittlepony.model.armour.PonyArmor; import com.minelittlepony.model.armour.PonyArmor;
import com.minelittlepony.model.capabilities.ICapitated;
import com.minelittlepony.model.capabilities.IModel; import com.minelittlepony.model.capabilities.IModel;
import com.minelittlepony.model.capabilities.IModelPart; import com.minelittlepony.model.capabilities.IModelPart;
import com.minelittlepony.model.components.PonySnout; import com.minelittlepony.model.components.PonySnout;
@ -16,7 +15,6 @@ import com.minelittlepony.render.model.PonyRenderer;
import com.minelittlepony.util.math.MathUtil; import com.minelittlepony.util.math.MathUtil;
import com.minelittlepony.util.render.AbstractBoxRenderer; import com.minelittlepony.util.render.AbstractBoxRenderer;
import net.minecraft.client.Minecraft;
import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelPlayer; import net.minecraft.client.model.ModelPlayer;
import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelRenderer;
@ -816,12 +814,10 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel, P
@Override @Override
public void render(Entity entity, float move, float swing, float ticks, float headYaw, float headPitch, float scale) { public void render(Entity entity, float move, float swing, float ticks, float headYaw, float headPitch, float scale) {
if (!(entity instanceof EntityLivingBase && ((EntityLivingBase)entity).isPlayerSleeping() && entity == Minecraft.getMinecraft().player)) {
pushMatrix(); pushMatrix();
transform(BodyPart.HEAD); transform(BodyPart.HEAD);
renderHead(entity, move, swing, ticks, headYaw, headPitch, scale); renderHead(entity, move, swing, ticks, headYaw, headPitch, scale);
popMatrix(); popMatrix();
}
pushMatrix(); pushMatrix();
transform(BodyPart.NECK); transform(BodyPart.NECK);