Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-7948: Bukkit#dispatchCommand uses the wrong CommandListenerWrapper for Players

Browse Source
This commit is contained in:
md_5 2024-11-06 20:20:36 +11:00
parent 7b44d46401
commit 9b048cc845
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
View File

@ -9,7 +9,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import net.minecraft.commands.CommandDispatcher; import net.minecraft.commands.CommandDispatcher;
import net.minecraft.commands.CommandListenerWrapper; import net.minecraft.commands.CommandListenerWrapper;
import net.minecraft.server.level.EntityPlayer;
import net.minecraft.server.level.WorldServer; import net.minecraft.server.level.WorldServer;
import net.minecraft.world.entity.vehicle.EntityMinecartCommandBlock; import net.minecraft.world.entity.vehicle.EntityMinecartCommandBlock;
import org.bukkit.Location; import org.bukkit.Location;
@ -22,6 +21,7 @@ import org.bukkit.command.defaults.BukkitCommand;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftEntity; import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.craftbukkit.entity.CraftMinecartCommand; import org.bukkit.craftbukkit.entity.CraftMinecartCommand;
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.entity.minecart.CommandMinecart; import org.bukkit.entity.minecart.CommandMinecart;
public final class VanillaCommandWrapper extends BukkitCommand { public final class VanillaCommandWrapper extends BukkitCommand {
@ -68,8 +68,8 @@ public final class VanillaCommandWrapper extends BukkitCommand {
return ((EntityMinecartCommandBlock) ((CraftMinecartCommand) sender).getHandle()).getCommandBlock().createCommandSourceStack(); return ((EntityMinecartCommandBlock) ((CraftMinecartCommand) sender).getHandle()).getCommandBlock().createCommandSourceStack();
} }
if (sender instanceof EntityPlayer player) { if (sender instanceof CraftPlayer player) {
return player.createCommandSourceStack(); return player.getHandle().createCommandSourceStack();
} }
return entity.getHandle().createCommandSourceStackForNameResolution((WorldServer) entity.getHandle().level()); return entity.getHandle().createCommandSourceStackForNameResolution((WorldServer) entity.getHandle().level());