diff --git a/patches/server/VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/VanillaCommandWrapper-didnt-account-for-entity-sende.patch
new file mode 100644
index 0000000000..211eb7b865
--- /dev/null
+++ b/patches/server/VanillaCommandWrapper-didnt-account-for-entity-sende.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Fri, 10 Sep 2021 15:49:12 -0700
+Subject: [PATCH] VanillaCommandWrapper didnt account for entity senders
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
++++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
+@@ -0,0 +0,0 @@ public final class VanillaCommandWrapper extends BukkitCommand {
+     }
+ 
+     public static CommandSourceStack getListener(CommandSender sender) {
+-        if (sender instanceof Player) {
+-            return ((CraftPlayer) sender).getHandle().createCommandSourceStack();
++        // Paper start - account for other entity command senders
++        if (sender instanceof org.bukkit.craftbukkit.entity.CraftEntity craftEntity) {
++            return craftEntity.getHandle().createCommandSourceStack();
++        // Paper end
+         }
+         if (sender instanceof BlockCommandSender) {
+             return ((CraftBlockCommandSender) sender).getWrapper();