diff options
Diffstat (limited to 'nms-patches/CustomFunction.patch')
| -rw-r--r-- | nms-patches/CustomFunction.patch | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/nms-patches/CustomFunction.patch b/nms-patches/CustomFunction.patch index ea37c185..a01167d4 100644 --- a/nms-patches/CustomFunction.patch +++ b/nms-patches/CustomFunction.patch @@ -1,11 +1,19 @@ --- a/net/minecraft/server/CustomFunction.java +++ b/net/minecraft/server/CustomFunction.java -@@ -122,7 +122,7 @@ +@@ -122,7 +122,15 @@ } public void a(CustomFunctionData customfunctiondata, ICommandListener icommandlistener, ArrayDeque<CustomFunctionData.a> arraydeque, int i) { - customfunctiondata.a().a(icommandlistener, this.a); -+ CommandBlockListenerAbstract.executeSafely(icommandlistener, ((CustomFunctionData.CustomFunctionListener) icommandlistener).sender, this.a); // CraftBukkit ++ // CraftBukkit start ++ org.bukkit.command.CommandSender sender; ++ if (icommandlistener instanceof CustomFunctionData.CustomFunctionListener) { ++ sender = ((CustomFunctionData.CustomFunctionListener) icommandlistener).sender; ++ } else { ++ sender = CommandBlockListenerAbstract.unwrapSender(icommandlistener); ++ } ++ CommandBlockListenerAbstract.executeSafely(icommandlistener, sender, this.a); ++ // CraftBukkit end } public String toString() { |