Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-19 02:11:28 +02:00
Code Issues Projects Releases Wiki Activity

SPIGOT-4044: Cannot load datapack functions on startup

Browse Source
This commit is contained in:
md_5 2018-07-19 10:48:34 +10:00
parent 40f15832b4
commit 80f4c10c8f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nms-patches/CommandListenerWrapper.patch
View File

@ -20,20 +20,21 @@
}, ArgumentAnchor.Anchor.FEET); }, ArgumentAnchor.Anchor.FEET);
} }
@@ -119,6 +121,12 @@ @@ -119,6 +121,13 @@
} }
public boolean hasPermission(int i) { public boolean hasPermission(int i) {
+ // CraftBukkit start + // CraftBukkit start
+ if (currentCommand != null) { + if (currentCommand != null) {
+ return (!getWorld().getServer().ignoreVanillaPermissions && this.f >= i) || getBukkitSender().hasPermission(org.bukkit.craftbukkit.command.VanillaCommandWrapper.getPermission(currentCommand)); + // World is null when loading functions
+ return ((getWorld() == null || !getWorld().getServer().ignoreVanillaPermissions) && this.f >= i) || getBukkitSender().hasPermission(org.bukkit.craftbukkit.command.VanillaCommandWrapper.getPermission(currentCommand));
+ } + }
+ // CraftBukkit end + // CraftBukkit end
+ +
return this.f >= i; return this.f >= i;
} }
@@ -232,4 +240,10 @@ @@ -232,4 +241,10 @@
public Collection<ICompletionProvider.a> a(boolean flag) { public Collection<ICompletionProvider.a> a(boolean flag) {
return Collections.singleton(ICompletionProvider.a.b); return Collections.singleton(ICompletionProvider.a.b);
} }