From 2e0b1376660d402de2cf6cd93acb08733f951aeb Mon Sep 17 00:00:00 2001
From: YouHaveTrouble <youhavetrouble@youhavetrouble.me>
Date: Sat, 28 May 2022 11:05:01 +0200
Subject: [PATCH] faster checks

---
 .../youhavetrouble/entiddy/SpecialEntities/JebSheep.java | 8 +++++---
 .../me/youhavetrouble/entiddy/SpecialEntities/Toast.java | 9 +++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/JebSheep.java b/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/JebSheep.java
index 5053427..d19d4ea 100644
--- a/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/JebSheep.java
+++ b/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/JebSheep.java
@@ -16,13 +16,15 @@ public class JebSheep implements EntiddyInterface {
         if (location.getWorld() == null) {
             throw new NullPointerException("World cannot be null");
         }
-        return location.getWorld().spawnEntity(location, EntityType.SHEEP, spawnReason,
-                (entity) -> entity.customName(Component.text("jeb_")));
+        return location.getWorld().spawnEntity(location, EntityType.SHEEP, spawnReason, (entity) -> {
+                    entity.customName(Component.text("jeb_"));
+                    entity.setCustomNameVisible(false);
+                });
     }
 
     @Override
     public boolean isInstance(@NotNull LivingEntity entity) {
         if (!(entity instanceof Sheep)) return false;
-        return entity.customName() != null && Objects.equals(entity.customName(), Component.text("jeb_"));
+        return Objects.equals(entity.customName(), Component.text("jeb_"));
     }
 }
diff --git a/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/Toast.java b/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/Toast.java
index d83d13f..07f8df4 100644
--- a/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/Toast.java
+++ b/src/main/java/me/youhavetrouble/entiddy/SpecialEntities/Toast.java
@@ -10,6 +10,8 @@ import org.bukkit.entity.Rabbit;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Objects;
+
 public class Toast implements EntiddyInterface {
 
     @Override
@@ -18,12 +20,15 @@ public class Toast implements EntiddyInterface {
             throw new NullPointerException("World cannot be null");
         }
         return location.getWorld().spawnEntity(location, EntityType.RABBIT, spawnReason,
-                (entity) -> entity.customName(Component.text("Toast")));
+                (entity) -> {
+                    entity.customName(Component.text("Toast"));
+                    entity.setCustomNameVisible(false);
+                });
     }
 
     @Override
     public boolean isInstance(@NotNull LivingEntity entity) {
         if (!(entity instanceof Rabbit)) return false;
-        return entity.getCustomName() != null && entity.getCustomName().equals("Toast");
+        return Objects.equals(entity.customName(), Component.text("Toast"));
     }
 }