Implement PR CommandAPI#478 in NMS 1_21_R3

Author: willkroboth

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.21.4/src/main/java/dev/jorel/commandapi/nms/NMS_1_21_R3.java

@@ -65,6 +65,7 @@
 import org.bukkit.craftbukkit.v1_21_R3.CraftParticle;
 import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
 import org.bukkit.craftbukkit.v1_21_R3.CraftSound;
+import org.bukkit.craftbukkit.v1_21_R3.CraftWorld;
 import org.bukkit.craftbukkit.v1_21_R3.block.data.CraftBlockData;
 import org.bukkit.craftbukkit.v1_21_R3.command.BukkitCommandWrapper;
 import org.bukkit.craftbukkit.v1_21_R3.command.VanillaCommandWrapper;
@@ -838,8 +839,7 @@ public String getScoreHolderSingle(CommandContext<CommandSourceStack> cmdCtx, St
 	}
 
 	@Override
-	public BukkitCommandSender<? extends CommandSender> getSenderForCommand(CommandContext<CommandSourceStack> cmdCtx,
-			boolean isNative) {
+	public BukkitCommandSender<? extends CommandSender> getSenderForCommand(CommandContext<CommandSourceStack> cmdCtx, boolean isNative) {
 		CommandSourceStack css = cmdCtx.getSource();
 
 		CommandSender sender = css.getBukkitSender();
@@ -851,10 +851,6 @@ public BukkitCommandSender<? extends CommandSender> getSenderForCommand(CommandC
 			// sender.
 			sender = Bukkit.getConsoleSender();
 		}
-		Vec3 pos = css.getPosition();
-		Vec2 rot = css.getRotation();
-		World world = getWorldForCSS(css);
-		Location location = new Location(world, pos.x(), pos.y(), pos.z(), rot.y, rot.x);
 
 		Entity proxyEntity = css.getEntity();
 		CommandSender proxy = proxyEntity == null ? null : proxyEntity.getBukkitEntity();
@@ -863,12 +859,42 @@ public BukkitCommandSender<? extends CommandSender> getSenderForCommand(CommandC
 				proxy = sender;
 			}
 
-			return new BukkitNativeProxyCommandSender(new NativeProxyCommandSender(sender, proxy, location, world));
+			return new BukkitNativeProxyCommandSender(new NativeProxyCommandSender_1_21_R3(css, sender, proxy));
 		} else {
 			return wrapCommandSender(sender);
 		}
 	}
 
+	@Override
+	public NativeProxyCommandSender createNativeProxyCommandSender(CommandSender caller, CommandSender callee, Location location, World world) {
+		if (callee == null) callee = caller;
+
+		// Most parameters default to what is defined by the caller
+		CommandSourceStack css = getBrigadierSourceFromCommandSender(wrapCommandSender(caller));
+
+		// Position and rotation may be overridden by the Location
+		if (location != null) {
+			css = css
+				.withPosition(new Vec3(location.getX(), location.getY(), location.getZ()))
+				.withRotation(new Vec2(location.getPitch(), location.getYaw()));
+		}
+
+		// ServerLevel may be overridden by the World
+		if (world == null && location != null) {
+			world = location.getWorld();
+		}
+		if (world != null) {
+			css = css.withLevel(((CraftWorld) world).getHandle());
+		}
+
+		// The proxied sender can only be an Entity in the CommandSourceStack
+		if (callee instanceof org.bukkit.entity.Entity e) {
+			css = css.withEntity(((CraftEntity) e).getHandle());
+		}
+
+		return new NativeProxyCommandSender_1_21_R3(css, caller, callee);
+	}
+
 	@Override
 	public final SimpleCommandMap getSimpleCommandMap() {
 		return ((CraftServer) Bukkit.getServer()).getCommandMap();

commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.21.4/src/main/java/dev/jorel/commandapi/nms/NativeProxyCommandSender_1_21_R3.java

@@ -0,0 +1,35 @@
+package dev.jorel.commandapi.nms;
+
+import dev.jorel.commandapi.CommandAPIBukkit;
+import dev.jorel.commandapi.wrappers.NativeProxyCommandSender;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.world.phys.Vec2;
+import net.minecraft.world.phys.Vec3;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.craftbukkit.v1_21_R3.command.ProxiedNativeCommandSender;
+
+public class NativeProxyCommandSender_1_21_R3 extends ProxiedNativeCommandSender implements NativeProxyCommandSender {
+	private final World world;
+	private final Location location;
+
+	public NativeProxyCommandSender_1_21_R3(CommandSourceStack css, CommandSender caller, CommandSender callee) {
+		super(css, caller, callee);
+
+		Vec3 pos = css.getPosition();
+		Vec2 rot = css.getRotation();
+		this.world = CommandAPIBukkit.get().getWorldForCSS(css);
+		this.location = new Location(this.world, pos.x(), pos.y(), pos.z(), rot.y, rot.x);
+	}
+
+	@Override
+	public Location getLocation() {
+		return location;
+	}
+
+	@Override
+	public World getWorld() {
+		return world;
+	}
+}