From 3d88bfd277958f3c6e3325b7cb8c4b2876457418 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Fri, 18 Nov 2016 08:54:22 +1100
Subject: [PATCH] SPIGOT-2771: Safely execute command block commands

By: md_5 <git@md-5.net>
---
 paper-server/nms-patches/CommandBlockListenerAbstract.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paper-server/nms-patches/CommandBlockListenerAbstract.patch b/paper-server/nms-patches/CommandBlockListenerAbstract.patch
index f23909ee56..ca7ab2a411 100644
--- a/paper-server/nms-patches/CommandBlockListenerAbstract.patch
+++ b/paper-server/nms-patches/CommandBlockListenerAbstract.patch
@@ -28,7 +28,7 @@
                      this.d = null;
 -                    this.b = icommandhandler.a(this, this.e);
 +                    // CraftBukkit start - Handle command block commands using Bukkit dispatcher
-+                    this.b = executeCommand(this, sender, this.e);
++                    this.b = executeSafely(this, sender, this.e);
 +                    // CraftBukkit end
                  } catch (Throwable throwable) {
                      CrashReport crashreport = CrashReport.a(throwable, "Executing command block");