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

Only blank skins and skins that support seapony mode should render as a seapony in seapony skin mode

Browse source
This commit is contained in:
Sollace 2018-07-07 14:29:09 +02:00
parent 62a0be23ad
commit 4ee7d2d88e
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java
View file

@ -6,6 +6,7 @@ import com.minelittlepony.model.capabilities.IModel;
import com.minelittlepony.model.components.PonyElytra; import com.minelittlepony.model.components.PonyElytra;
import com.minelittlepony.model.player.PlayerModels; import com.minelittlepony.model.player.PlayerModels;
import com.minelittlepony.pony.data.Pony; import com.minelittlepony.pony.data.Pony;
import com.minelittlepony.pony.data.PonyRace;
import com.minelittlepony.render.layer.AbstractPonyLayer; import com.minelittlepony.render.layer.AbstractPonyLayer;
import com.voxelmodpack.hdskins.gui.RenderPlayerModel; import com.voxelmodpack.hdskins.gui.RenderPlayerModel;
@ -45,11 +46,15 @@ public class RenderPonyModel extends RenderPlayerModel<EntityPonyModel> {
Pony thePony = MineLittlePony.getInstance().getManager().getPony(loc, slim); Pony thePony = MineLittlePony.getInstance().getManager().getPony(loc, slim);
if (thePony.getRace(false).isHuman()) { PonyRace race = thePony.getRace(false);
if (race.isHuman()) {
return super.getEntityModel(playermodel); return super.getEntityModel(playermodel);
} }
ModelWrapper pm = playermodel.wet ? PlayerModels.SEAPONY.getModel(slim) : thePony.getModel(true); boolean canWet = playermodel.wet && (loc == playermodel.getBlankSkin() || race == PonyRace.SEAPONY);
ModelWrapper pm = canWet ? PlayerModels.SEAPONY.getModel(slim) : thePony.getModel(true);
pm.apply(thePony.getMetadata()); pm.apply(thePony.getMetadata());
renderingAsHuman = false; renderingAsHuman = false;