From 1911a6dde88f6309d01cdaddd58bcddd8493152c Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 14 Jul 2019 01:10:42 +0200 Subject: [PATCH] This is never going to be null. We have to check for the missing sprite instead. -_- --- .../com/minelittlepony/client/hdskins/gui/PonyPreview.java | 3 ++- src/main/java/com/minelittlepony/client/pony/PonyManager.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java b/src/main/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java index f546033e..78f1a872 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java +++ b/src/main/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java @@ -1,5 +1,6 @@ package com.minelittlepony.client.hdskins.gui; +import net.minecraft.client.texture.MissingSprite; import net.minecraft.util.Identifier; import com.minelittlepony.client.MineLittlePony; @@ -36,7 +37,7 @@ class PonyPreview extends PlayerPreview { protected DummyPlayer ponify(DummyPlayer human, DummyPlayer pony) { Identifier loc = human.getTextures().get(Type.SKIN).getId(); - if (loc == null || Pony.getBufferedImage(loc) == null) { + if (loc == null || Pony.getBufferedImage(loc) == MissingSprite.getMissingSpriteTexture().getImage()) { return pony; } diff --git a/src/main/java/com/minelittlepony/client/pony/PonyManager.java b/src/main/java/com/minelittlepony/client/pony/PonyManager.java index 7b35f6cc..3f44f915 100644 --- a/src/main/java/com/minelittlepony/client/pony/PonyManager.java +++ b/src/main/java/com/minelittlepony/client/pony/PonyManager.java @@ -20,6 +20,7 @@ import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.AbstractClientPlayerEntity; import net.minecraft.client.network.PlayerListEntry; +import net.minecraft.client.texture.MissingSprite; import net.minecraft.client.util.DefaultSkinHelper; import net.minecraft.resource.Resource; import net.minecraft.resource.ResourceManager; @@ -98,7 +99,7 @@ public class PonyManager implements IPonyManager, IdentifiableResourceReloadList Identifier skin = playerInfo.getSkinTexture(); UUID uuid = playerInfo.getProfile().getId(); - if (Pony.getBufferedImage(skin) == null) { + if (Pony.getBufferedImage(skin) == MissingSprite.getMissingSpriteTexture().getImage()) { return getDefaultPony(uuid); }