mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Things, and Starlight (maybe)

Browse source
This commit is contained in:
Nassim Jahnke 2022-06-08 13:44:30 +02:00
parent 8d5407b16f
commit d28b20944b
No known key found for this signature in database
GPG key ID: 6BE3B555EBC5982B
29 changed files with 187 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

23
patches/server/0783-VanillaCommandWrapper-didnt-account-for-entity-sende.patch Normal file
View file

@ -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 8dca2ad7d25f740941187698d77819af8ebc2805..6df44aa60d2b41b95fe79ed4cf92a6d3369400ea 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
@@ -64,8 +64,10 @@ 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();