SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.21.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-10-23 02:15:00 +11:00
parent 2c4beb962b
commit d3a23f42c3
522 changed files with 8501 additions and 6477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ import java.util.Collections;
import java.util.List;
import net.minecraft.commands.CommandDispatcher;
import net.minecraft.commands.CommandListenerWrapper;
import net.minecraft.server.level.WorldServer;
import net.minecraft.world.entity.vehicle.EntityMinecartCommandBlock;
import org.bukkit.Location;
import org.bukkit.command.BlockCommandSender;
@@ -20,7 +21,6 @@ import org.bukkit.command.defaults.BukkitCommand;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.craftbukkit.entity.CraftMinecartCommand;
import org.bukkit.entity.Entity;
import org.bukkit.entity.minecart.CommandMinecart;
public final class VanillaCommandWrapper extends BukkitCommand {
@@ -62,12 +62,12 @@ public final class VanillaCommandWrapper extends BukkitCommand {
}
public static CommandListenerWrapper getListener(CommandSender sender) {
if (sender instanceof Entity) {
if (sender instanceof CraftEntity entity) {
if (sender instanceof CommandMinecart) {
return ((EntityMinecartCommandBlock) ((CraftMinecartCommand) sender).getHandle()).getCommandBlock().createCommandSourceStack();
}
return ((CraftEntity) sender).getHandle().createCommandSourceStack();
return entity.getHandle().createCommandSourceStackForNameResolution((WorldServer) entity.getHandle().level());
}
if (sender instanceof BlockCommandSender) {
return ((CraftBlockCommandSender) sender).getWrapper();