summaryrefslogtreecommitdiffstats
path: root/nms-patches/CustomFunctionData.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-06-25 09:46:19 +1000
committermd_5 <git@md-5.net>2017-06-25 09:46:19 +1000
commit258575110f7c0abc0e3c8b85254b22b28fca27b1 (patch)
tree6bf095cecdf15407d15990b70a4a6f0dbe35d2e9 /nms-patches/CustomFunctionData.patch
parent753a8e700db5216abcc53eb56a9c26226c1ad9ed (diff)
downloadcraftbukkit-258575110f7c0abc0e3c8b85254b22b28fca27b1.tar
craftbukkit-258575110f7c0abc0e3c8b85254b22b28fca27b1.tar.gz
craftbukkit-258575110f7c0abc0e3c8b85254b22b28fca27b1.tar.lz
craftbukkit-258575110f7c0abc0e3c8b85254b22b28fca27b1.tar.xz
craftbukkit-258575110f7c0abc0e3c8b85254b22b28fca27b1.zip
SPIGOT-3373: Fix /execute in gameloop functions
Diffstat (limited to 'nms-patches/CustomFunctionData.patch')
-rw-r--r--nms-patches/CustomFunctionData.patch22
1 files changed, 19 insertions, 3 deletions
diff --git a/nms-patches/CustomFunctionData.patch b/nms-patches/CustomFunctionData.patch
index f0baac84..821ff006 100644
--- a/nms-patches/CustomFunctionData.patch
+++ b/nms-patches/CustomFunctionData.patch
@@ -1,6 +1,22 @@
--- a/net/minecraft/server/CustomFunctionData.java
+++ b/net/minecraft/server/CustomFunctionData.java
-@@ -33,7 +33,7 @@
+@@ -23,7 +23,14 @@
+ private CustomFunction f;
+ private final ArrayDeque<CustomFunctionData.a> g = new ArrayDeque();
+ private boolean h = false;
+- private final ICommandListener i = new ICommandListener() {
++ // CraftBukkit start
++ private final ICommandListener i = new CustomFunctionListener();
++
++ public class CustomFunctionListener implements ICommandListener {
++
++ protected org.bukkit.command.CommandSender sender = new org.bukkit.craftbukkit.command.CraftFunctionCommandSender(this);
++ // CraftBukkit end
++
+ public String getName() {
+ return CustomFunctionData.this.e;
+ }
+@@ -33,7 +40,7 @@
}
public World getWorld() {
@@ -9,7 +25,7 @@
}
public MinecraftServer C_() {
-@@ -57,7 +57,7 @@
+@@ -57,7 +64,7 @@
}
public int c() {
@@ -18,7 +34,7 @@
}
public Map<MinecraftKey, CustomFunction> d() {
-@@ -65,7 +65,7 @@
+@@ -65,7 +72,7 @@
}
public void e() {