diff --git a/patches/server/0702-Vanilla-command-permission-fixes.patch b/patches/server/0702-Vanilla-command-permission-fixes.patch
index 44a7db13ec1a..818f20c83597 100644
--- a/patches/server/0702-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0702-Vanilla-command-permission-fixes.patch
@@ -6,9 +6,13 @@ Subject: [PATCH] Vanilla command permission fixes
 Fixes permission checks for vanilla commands which don't have a
 requirement, as well as for namespaced vanilla commands.
 
+Fixes permission checking for command functions
+
 == AT ==
 public-f com.mojang.brigadier.tree.CommandNode requirement
 
+Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
+
 diff --git a/src/main/java/com/mojang/brigadier/builder/ArgumentBuilder.java b/src/main/java/com/mojang/brigadier/builder/ArgumentBuilder.java
 index 899008b2980d13f1be6280cd8cb959c53a29bebf..f875507241ac6769545e91cd3285232b75b892f0 100644
 --- a/src/main/java/com/mojang/brigadier/builder/ArgumentBuilder.java
@@ -32,6 +36,26 @@ index 899008b2980d13f1be6280cd8cb959c53a29bebf..f875507241ac6769545e91cd3285232b
      private CommandNode<S> target;
      private RedirectModifier<S> modifier = null;
      private boolean forks;
+diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
+index 2ff021966426dd6c7c1081fbcfacf4677b404264..8cd678740dc6475d4ae6db6f35d8b73652588cb4 100644
+--- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
++++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
+@@ -209,8 +209,13 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
+ 
+     // CraftBukkit start
+     public boolean hasPermission(int i, String bukkitPermission) {
+-        // World is null when loading functions
+-        return ((this.getLevel() == null || !this.getLevel().getCraftServer().ignoreVanillaPermissions) && this.permissionLevel >= i) || this.getBukkitSender().hasPermission(bukkitPermission);
++        // Paper start - fix incomplete fix
++        if (this.source == CommandSource.NULL) { // CommandSource.NULL is used for datapack loading
++            return this.permissionLevel >= i;
++        } else {
++            return (!this.getLevel().getCraftServer().ignoreVanillaPermissions && this.permissionLevel >= i) || this.getBukkitSender().hasPermission(bukkitPermission);
++        }
++        // Paper end
+     }
+     // CraftBukkit end
+ 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
 index 9c0b2679964f864671ff4041163d1065c8d9cf84..27093aed1f4112a5414671fd5d9c4e683011506d 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
diff --git a/patches/server/0781-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0781-Fix-entity-type-tags-suggestions-in-selectors.patch
index 4e3235ade312..c073ff370be7 100644
--- a/patches/server/0781-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0781-Fix-entity-type-tags-suggestions-in-selectors.patch
@@ -10,10 +10,10 @@ when if this was fixed on the client, that wouldn't be needed.
 Mojira Issue: https://bugs.mojang.com/browse/MC-235045
 
 diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-index 2ff021966426dd6c7c1081fbcfacf4677b404264..81f4e3c869623b6dd2d80886652fa41791fe7032 100644
+index 8cd678740dc6475d4ae6db6f35d8b73652588cb4..86616c10bb6dcdd13f75829ca4fa4afa81ea7f04 100644
 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
 +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-@@ -413,4 +413,20 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
+@@ -418,4 +418,20 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
          return this.source.getBukkitSender(this);
      }
      // CraftBukkit end