mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-01 16:07:36 +02:00
275173e538
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 0c5d8709 SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends 255c4fdb SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot CraftBukkit Changes: b6b514b7e SPIGOT-7400: Downgrade maven-resolver due to issues resolving certain depends fcff84de9 SPIGOT-7399: Revert null check in CraftMetaItem#safelyAdd 44a4b5649 SPIGOT-7380: Add PlayerInteractEvent#getClickedPosition and ChiseledBookshelf#getSlot 676969d01 SPIGOT-7389: Handle setting null items in ChiseledBookshelf Inventory
24 lines
1.3 KiB
Diff
24 lines
1.3 KiB
Diff
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 b26ac7192e532be94a57a70e12270272034fd5ef..bd45d59cbfe877717b90221fbb8d03d266958984 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();
|