From 67f1e1edbd0becd1135706aa8caabc7f17c5a893 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Mon, 24 Jun 2019 14:05:07 +0200
Subject: [PATCH] Fixed broken fire texture on villagers/zombie villagers

---
 .../client/render/entities/RenderPonyVillager.java         | 7 +++++--
 .../client/render/entities/RenderPonyZombieVillager.java   | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java
index 8a422052..df7bc630 100644
--- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java
+++ b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java
@@ -8,6 +8,7 @@ import com.mojang.blaze3d.platform.GlStateManager;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.client.render.entity.feature.VillagerClothingFeatureRenderer;
+import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.entity.passive.VillagerEntity;
 import net.minecraft.resource.ReloadableResourceManager;
 import net.minecraft.util.Identifier;
@@ -32,8 +33,10 @@ public class RenderPonyVillager extends RenderPonyMob.Caster<VillagerEntity, Mod
     @Override
     public void bindTexture(Identifier texture) {
 
-        if (!"minelittlepony".contentEquals(texture.getNamespace())) {
-            texture = new Identifier("minelittlepony", texture.getPath());
+        if (texture != SpriteAtlasTexture.BLOCK_ATLAS_TEX) {
+            if (!"minelittlepony".contentEquals(texture.getNamespace())) {
+                texture = new Identifier("minelittlepony", texture.getPath());
+            }
         }
 
         super.bindTexture(texture);
diff --git a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java
index f113a088..796e24df 100644
--- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java
+++ b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java
@@ -7,6 +7,7 @@ import com.minelittlepony.util.resources.ITextureSupplier;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.client.render.entity.feature.VillagerClothingFeatureRenderer;
+import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.entity.mob.ZombieVillagerEntity;
 import net.minecraft.resource.ReloadableResourceManager;
 import net.minecraft.util.Identifier;
@@ -31,8 +32,10 @@ public class RenderPonyZombieVillager extends RenderPonyMob.Caster<ZombieVillage
     @Override
     public void bindTexture(Identifier texture) {
 
-        if (!"minelittlepony".contentEquals(texture.getNamespace())) {
-            texture = new Identifier("minelittlepony", texture.getPath());
+        if (texture != SpriteAtlasTexture.BLOCK_ATLAS_TEX) {
+            if (!"minelittlepony".contentEquals(texture.getNamespace())) {
+                texture = new Identifier("minelittlepony", texture.getPath());
+            }
         }
 
         super.bindTexture(texture);