From ae4d5a164d0df8e260bc9a6146c63bc2ee43e783 Mon Sep 17 00:00:00 2001
From: "Sam (Xemor)" <samuelhollis@outlook.com>
Date: Tue, 28 May 2024 00:04:29 +0100
Subject: [PATCH] Fix customName NPE

---
 .../java/me/tofaa/entitylib/spigot/SpigotEntityLibAPI.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/SpigotEntityLibAPI.java b/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/SpigotEntityLibAPI.java
index 0b84169..a7e519d 100644
--- a/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/SpigotEntityLibAPI.java
+++ b/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/SpigotEntityLibAPI.java
@@ -51,7 +51,8 @@ public class SpigotEntityLibAPI extends AbstractEntityLibAPI<JavaPlugin, BukkitT
         EntityMeta meta = EntityMeta.createMeta(e.getEntityId(), type);
         meta.setHasNoGravity(!e.hasGravity());
         meta.setCustomNameVisible(e.isCustomNameVisible());
-        meta.setCustomName(LegacyComponentSerializer.legacyAmpersand().deserialize(e.getCustomName()));
+        String customName = e.getCustomName();
+        if (customName != null) meta.setCustomName(LegacyComponentSerializer.legacyAmpersand().deserialize(customName));
         meta.setPose(ExtraConversionUtil.fromBukkitPose(e.getPose()));
         meta.setOnFire(e.getFireTicks() > 0);
         meta.setSilent(e.isSilent());