From 8784091115436f8efc9431a3c3ba7c3bfe25e975 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Mon, 16 Jul 2018 16:20:46 +1000
Subject: [PATCH] Command block names are not nullable

By: md_5 <git@md-5.net>
---
 .../nms-patches/CommandBlockListenerAbstract.patch   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/paper-server/nms-patches/CommandBlockListenerAbstract.patch b/paper-server/nms-patches/CommandBlockListenerAbstract.patch
index 84668fcc33..39842e8109 100644
--- a/paper-server/nms-patches/CommandBlockListenerAbstract.patch
+++ b/paper-server/nms-patches/CommandBlockListenerAbstract.patch
@@ -35,3 +35,15 @@
                      } catch (Throwable throwable) {
                          CrashReport crashreport = CrashReport.a(throwable, "Executing command block");
                          CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Command to be executed");
+@@ -141,6 +139,11 @@
+     }
+ 
+     public void setName(IChatBaseComponent ichatbasecomponent) {
++        // CraftBukkit start
++        if (ichatbasecomponent == null) {
++            ichatbasecomponent = new ChatComponentText("@");
++        }
++        // CraftBukkit end
+         this.h = ichatbasecomponent;
+     }
+