From 7f734a18b7d7cdb4f696d76984e17cac28bd00b8 Mon Sep 17 00:00:00 2001 From: Riley Park Date: Tue, 18 May 2021 08:57:17 -0700 Subject: [PATCH] Avoid NPE due to PlayerBedFailEnterEvent fixes #5670 --- Spigot-Server-Patches/Added-PlayerBedFailEnterEvent.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Spigot-Server-Patches/Added-PlayerBedFailEnterEvent.patch b/Spigot-Server-Patches/Added-PlayerBedFailEnterEvent.patch index 6a77abe0e5..f48effc446 100644 --- a/Spigot-Server-Patches/Added-PlayerBedFailEnterEvent.patch +++ b/Spigot-Server-Patches/Added-PlayerBedFailEnterEvent.patch @@ -48,7 +48,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 // CraftBukkit end if (entityhuman_enumbedresult != null) { - entityhuman.a(entityhuman_enumbedresult.a(), true); -+ entityhuman.a(PaperAdventure.asVanilla(event.getMessage()), true); // Paper ++ final net.kyori.adventure.text.Component message = event.getMessage(); // Paper ++ if(message != null) entityhuman.a(PaperAdventure.asVanilla(message), true); // Paper } + } // Paper