From f7a92ea3e95a150fddf4621a485edf2b2a111e82 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Wed, 29 May 2019 20:45:46 +0200
Subject: [PATCH] Fixed crash when viewing a villager or witch that does not
 have a custom name

---
 .../client/model/entities/ModelVillagerPony.java     |  2 +-
 .../client/model/entities/ModelWitchPony.java        |  2 +-
 .../client/render/entities/RenderPonyVillager.java   | 12 +++++++-----
 .../render/entities/RenderPonyZombieVillager.java    | 12 +++++++-----
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java b/src/main/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java
index 71bb0170..fe6357a3 100644
--- a/src/main/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java
+++ b/src/main/java/com/minelittlepony/client/model/entities/ModelVillagerPony.java
@@ -28,7 +28,7 @@ public class ModelVillagerPony<T extends LivingEntity & VillagerDataContainer> e
     @Override
     public void animateModel(T entity, float limbSwing, float limbSwingAmount, float partialTickTime) {
         profession = entity.getVillagerData().getProfession();
-        special = "Derpy".equals(entity.getCustomName().getString());
+        special = entity.hasCustomName() && "Derpy".equals(entity.getCustomName().getString());
         special2 = special && entity.getUuid().getLeastSignificantBits() % 20 == 0;
     }
 
diff --git a/src/main/java/com/minelittlepony/client/model/entities/ModelWitchPony.java b/src/main/java/com/minelittlepony/client/model/entities/ModelWitchPony.java
index d7032fa5..ff4d66a6 100644
--- a/src/main/java/com/minelittlepony/client/model/entities/ModelWitchPony.java
+++ b/src/main/java/com/minelittlepony/client/model/entities/ModelWitchPony.java
@@ -17,7 +17,7 @@ public class ModelWitchPony extends ModelZebra<WitchEntity> {
     public void updateLivingState(WitchEntity entity, IPony pony) {
         super.updateLivingState(entity, pony);
 
-        if ("Filly".equals(entity.getCustomName().getString())) {
+        if (entity.hasCustomName() && "Filly".equals(entity.getCustomName().getString())) {
             isChild = true;
         }
         leftArmPose = ArmPose.EMPTY;
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 3bf48fdc..c55db6c6 100644
--- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java
+++ b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyVillager.java
@@ -32,12 +32,14 @@ public class RenderPonyVillager extends RenderPonyMob.Caster<VillagerEntity, Mod
 
     @Override
     public Identifier findTexture(VillagerEntity entity) {
-        String name = entity.getCustomName().getString();
-        if ("Derpy".equals(name) || (entity.isBaby() && "Dinky".equals(name))) {
-            if (entity.isBaby()) {
-                return EGG_2;
+        if (entity.hasCustomName()) {
+            String name = entity.getCustomName().getString();
+            if ("Derpy".equals(name) || (entity.isBaby() && "Dinky".equals(name))) {
+                if (entity.isBaby()) {
+                    return EGG_2;
+                }
+                return EGG;
             }
-            return EGG;
         }
 
         return PROFESSIONS.supplyTexture(entity.getVillagerData());
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 addbe04f..ef23da0f 100644
--- a/src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java
+++ b/src/main/java/com/minelittlepony/client/render/entities/RenderPonyZombieVillager.java
@@ -25,12 +25,14 @@ public class RenderPonyZombieVillager extends RenderPonyMob.Caster<ZombieVillage
 
     @Override
     public Identifier findTexture(ZombieVillagerEntity entity) {
-        String name = entity.getCustomName().getString();
-        if ("Derpy".equals(name) || (entity.isBaby() && "Dinky".equals(name))) {
-            if (entity.isBaby()) {
-                return EGG_2;
+        if (entity.hasCustomName()) {
+            String name = entity.getCustomName().getString();
+            if ("Derpy".equals(name) || (entity.isBaby() && "Dinky".equals(name))) {
+                if (entity.isBaby()) {
+                    return EGG_2;
+                }
+                return EGG;
             }
-            return EGG;
         }
 
         return PROFESSIONS.supplyTexture(entity.getVillagerData());