mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 13:06:02 +01:00
a284e40c70
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: 9b45fa2f #667: Allow setting BrewEvent results 8c776ddc SPIGOT-6762: ChatPaginator.wordWrap only transfers one modifier da372966 SPIGOT-4590, SPIGOT-6769: Clarify DamageCause documentation CraftBukkit Changes: cef1fda3 #947: Add missing spawn eggs for SpawnEggMeta eb9a0f34 #945: Allow setting BrewEvent results
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 e9d1fb479855194da5a05e86861848158736cbb4..4aa1dc543950b5de64345b3403a6d0bc41c521df 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();
|