From 4ee7d2d88edd6ff9b76cb51425a30aa3baa078fe Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 7 Jul 2018 14:29:09 +0200 Subject: [PATCH] Only blank skins and skins that support seapony mode should render as a seapony in seapony skin mode --- .../com/minelittlepony/hdskins/gui/RenderPonyModel.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java b/src/main/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java index a1f83e99..21b2e8c2 100644 --- a/src/main/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java +++ b/src/main/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java @@ -6,6 +6,7 @@ import com.minelittlepony.model.capabilities.IModel; import com.minelittlepony.model.components.PonyElytra; import com.minelittlepony.model.player.PlayerModels; import com.minelittlepony.pony.data.Pony; +import com.minelittlepony.pony.data.PonyRace; import com.minelittlepony.render.layer.AbstractPonyLayer; import com.voxelmodpack.hdskins.gui.RenderPlayerModel; @@ -45,11 +46,15 @@ public class RenderPonyModel extends RenderPlayerModel { 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); } - 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()); renderingAsHuman = false;