From 183139d41f9c59f4b51ffa79eec4c04762fd9ae8 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 10 Apr 2020 11:16:58 +1000
Subject: [PATCH] SPIGOT-5665: Improve loading spawn egg NBT

---
 nms-patches/EntityTypes.patch | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nms-patches/EntityTypes.patch b/nms-patches/EntityTypes.patch
index dfcd60afc0..e74c238b46 100644
--- a/nms-patches/EntityTypes.patch
+++ b/nms-patches/EntityTypes.patch
@@ -28,6 +28,15 @@
      }
  
      @Nullable
+@@ -195,7 +201,7 @@
+                 t0.setCustomName(ichatbasecomponent);
+             }
+ 
+-            a(world, entityhuman, t0, nbttagcompound);
++            try { a(world, entityhuman, t0, nbttagcompound); } catch (Throwable t) { LOGGER.warn("Error loading spawn egg NBT", t); } // CraftBukkit - SPIGOT-5665
+             return t0;
+         }
+     }
 @@ -328,7 +334,7 @@
              }