From 258575110f7c0abc0e3c8b85254b22b28fca27b1 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 25 Jun 2017 09:46:19 +1000
Subject: SPIGOT-3373: Fix /execute in gameloop functions

---
 nms-patches/CommandExecute.patch | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'nms-patches/CommandExecute.patch')

diff --git a/nms-patches/CommandExecute.patch b/nms-patches/CommandExecute.patch
index 8fbfb2ea..bd31145b 100644
--- a/nms-patches/CommandExecute.patch
+++ b/nms-patches/CommandExecute.patch
@@ -11,7 +11,7 @@
  
  public class CommandExecute extends CommandAbstract {
  
-@@ -59,26 +63,59 @@
+@@ -59,26 +63,61 @@
              }
  
              String s = a(astring, b0);
@@ -31,6 +31,8 @@
 +                        sender = minecraftserver.remoteConsole;
 +                    } else if (listener instanceof CommandBlockListenerAbstract) {
 +                        sender = ((CommandBlockListenerAbstract) listener).sender;
++                    } else if (listener instanceof CustomFunctionData.CustomFunctionListener) {
++                        sender = ((CustomFunctionData.CustomFunctionListener) listener).sender;
 +                    } else if (listener instanceof CommandListenerWrapper) {
 +                        listener = ((CommandListenerWrapper) listener).base; // Search deeper
 +                    } else if (VanillaCommandWrapper.lastSender != null) {
-- 
cgit v1.2.3