Move CraftBukkit per-file patches

By: Initial <noreply+automated@papermc.io>

paper-server/patches/sources/net/minecraft/server/commands/CommandDifficulty.patch

@@ -0,0 +1,17 @@
+--- a/net/minecraft/server/commands/CommandDifficulty.java
++++ b/net/minecraft/server/commands/CommandDifficulty.java
+@@ -44,11 +44,12 @@
+ 
+     public static int setDifficulty(CommandListenerWrapper commandlistenerwrapper, EnumDifficulty enumdifficulty) throws CommandSyntaxException {
+         MinecraftServer minecraftserver = commandlistenerwrapper.getServer();
++        net.minecraft.server.level.WorldServer worldServer = commandlistenerwrapper.getLevel(); // CraftBukkit
+ 
+-        if (minecraftserver.getWorldData().getDifficulty() == enumdifficulty) {
++        if (worldServer.getDifficulty() == enumdifficulty) { // CraftBukkit
+             throw CommandDifficulty.ERROR_ALREADY_DIFFICULT.create(enumdifficulty.getKey());
+         } else {
+-            minecraftserver.setDifficulty(enumdifficulty, true);
++            worldServer.serverLevelData.setDifficulty(enumdifficulty); // CraftBukkit
+             commandlistenerwrapper.sendSuccess(() -> {
+                 return IChatBaseComponent.translatable("commands.difficulty.success", enumdifficulty.getDisplayName());
+             }, true);

paper-server/patches/sources/net/minecraft/server/commands/CommandEffect.patch

@@ -0,0 +1,29 @@
+--- a/net/minecraft/server/commands/CommandEffect.java
++++ b/net/minecraft/server/commands/CommandEffect.java
+@@ -84,7 +84,7 @@
+             if (entity instanceof EntityLiving) {
+                 MobEffect mobeffect = new MobEffect(holder, k, i, false, flag);
+ 
+-                if (((EntityLiving) entity).addEffect(mobeffect, commandlistenerwrapper.getEntity())) {
++                if (((EntityLiving) entity).addEffect(mobeffect, commandlistenerwrapper.getEntity(), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.COMMAND)) { // CraftBukkit
+                     ++j;
+                 }
+             }
+@@ -114,7 +114,7 @@
+         while (iterator.hasNext()) {
+             Entity entity = (Entity) iterator.next();
+ 
+-            if (entity instanceof EntityLiving && ((EntityLiving) entity).removeAllEffects()) {
++            if (entity instanceof EntityLiving && ((EntityLiving) entity).removeAllEffects(org.bukkit.event.entity.EntityPotionEffectEvent.Cause.COMMAND)) { // CraftBukkit
+                 ++i;
+             }
+         }
+@@ -144,7 +144,7 @@
+         while (iterator.hasNext()) {
+             Entity entity = (Entity) iterator.next();
+ 
+-            if (entity instanceof EntityLiving && ((EntityLiving) entity).removeEffect(holder)) {
++            if (entity instanceof EntityLiving && ((EntityLiving) entity).removeEffect(holder, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.COMMAND)) { // CraftBukkit
+                 ++i;
+             }
+         }

paper-server/patches/sources/net/minecraft/server/commands/CommandGamerule.patch

@@ -0,0 +1,20 @@
+--- a/net/minecraft/server/commands/CommandGamerule.java
++++ b/net/minecraft/server/commands/CommandGamerule.java
+@@ -34,7 +34,7 @@
+ 
+     static <T extends GameRules.GameRuleValue<T>> int setRule(CommandContext<CommandListenerWrapper> commandcontext, GameRules.GameRuleKey<T> gamerules_gamerulekey) {
+         CommandListenerWrapper commandlistenerwrapper = (CommandListenerWrapper) commandcontext.getSource();
+-        T t0 = commandlistenerwrapper.getServer().getGameRules().getRule(gamerules_gamerulekey);
++        T t0 = commandlistenerwrapper.getLevel().getGameRules().getRule(gamerules_gamerulekey); // CraftBukkit
+ 
+         t0.setFromArgument(commandcontext, "value");
+         commandlistenerwrapper.sendSuccess(() -> {
+@@ -44,7 +44,7 @@
+     }
+ 
+     static <T extends GameRules.GameRuleValue<T>> int queryRule(CommandListenerWrapper commandlistenerwrapper, GameRules.GameRuleKey<T> gamerules_gamerulekey) {
+-        T t0 = commandlistenerwrapper.getServer().getGameRules().getRule(gamerules_gamerulekey);
++        T t0 = commandlistenerwrapper.getLevel().getGameRules().getRule(gamerules_gamerulekey); // CraftBukkit
+ 
+         commandlistenerwrapper.sendSuccess(() -> {
+             return IChatBaseComponent.translatable("commands.gamerule.query", gamerules_gamerulekey.getId(), t0.toString());

paper-server/patches/sources/net/minecraft/server/commands/CommandGive.patch

@@ -0,0 +1,11 @@
+--- a/net/minecraft/server/commands/CommandGive.java
++++ b/net/minecraft/server/commands/CommandGive.java
+@@ -60,7 +60,7 @@
+                     EntityItem entityitem;
+ 
+                     if (flag && itemstack1.isEmpty()) {
+-                        entityitem = entityplayer.drop(itemstack, false);
++                        entityitem = entityplayer.drop(itemstack, false, false, false); // CraftBukkit - SPIGOT-2942: Add boolean to call event
+                         if (entityitem != null) {
+                             entityitem.makeFakeItem();
+                         }

paper-server/patches/sources/net/minecraft/server/commands/CommandList.patch

@@ -0,0 +1,18 @@
+--- a/net/minecraft/server/commands/CommandList.java
++++ b/net/minecraft/server/commands/CommandList.java
+@@ -35,7 +35,14 @@
+ 
+     private static int format(CommandListenerWrapper commandlistenerwrapper, Function<EntityPlayer, IChatBaseComponent> function) {
+         PlayerList playerlist = commandlistenerwrapper.getServer().getPlayerList();
+-        List<EntityPlayer> list = playerlist.getPlayers();
++        // CraftBukkit start
++        List<EntityPlayer> players = playerlist.getPlayers();
++        if (commandlistenerwrapper.getBukkitSender() instanceof org.bukkit.entity.Player) {
++            org.bukkit.entity.Player sender = (org.bukkit.entity.Player) commandlistenerwrapper.getBukkitSender();
++            players = players.stream().filter((ep) -> sender.canSee(ep.getBukkitEntity())).collect(java.util.stream.Collectors.toList());
++        }
++        List<EntityPlayer> list = players;
++        // CraftBukkit end
+         IChatBaseComponent ichatbasecomponent = ChatComponentUtils.formatList(list, function);
+ 
+         commandlistenerwrapper.sendSuccess(() -> {

paper-server/patches/sources/net/minecraft/server/commands/CommandLoot.patch

@@ -0,0 +1,19 @@
+--- a/net/minecraft/server/commands/CommandLoot.java
++++ b/net/minecraft/server/commands/CommandLoot.java
+@@ -95,7 +95,7 @@
+     }
+ 
+     private static <T extends ArgumentBuilder<CommandListenerWrapper, T>> T addTargets(T t0, CommandLoot.c commandloot_c) {
+-        return t0.then(((LiteralArgumentBuilder) net.minecraft.commands.CommandDispatcher.literal("replace").then(net.minecraft.commands.CommandDispatcher.literal("entity").then(net.minecraft.commands.CommandDispatcher.argument("entities", ArgumentEntity.entities()).then(commandloot_c.construct(net.minecraft.commands.CommandDispatcher.argument("slot", ArgumentInventorySlot.slot()), (commandcontext, list, commandloot_a) -> {
++        return (T) t0.then(((LiteralArgumentBuilder) net.minecraft.commands.CommandDispatcher.literal("replace").then(net.minecraft.commands.CommandDispatcher.literal("entity").then(net.minecraft.commands.CommandDispatcher.argument("entities", ArgumentEntity.entities()).then(commandloot_c.construct(net.minecraft.commands.CommandDispatcher.argument("slot", ArgumentInventorySlot.slot()), (commandcontext, list, commandloot_a) -> { // CraftBukkit - decompile error
+             return entityReplace(ArgumentEntity.getEntities(commandcontext, "entities"), ArgumentInventorySlot.getSlot(commandcontext, "slot"), list.size(), list, commandloot_a);
+         }).then(commandloot_c.construct(net.minecraft.commands.CommandDispatcher.argument("count", IntegerArgumentType.integer(0)), (commandcontext, list, commandloot_a) -> {
+             return entityReplace(ArgumentEntity.getEntities(commandcontext, "entities"), ArgumentInventorySlot.getSlot(commandcontext, "slot"), IntegerArgumentType.getInteger(commandcontext, "count"), list, commandloot_a);
+@@ -250,6 +250,7 @@
+     private static int dropInWorld(CommandListenerWrapper commandlistenerwrapper, Vec3D vec3d, List<ItemStack> list, CommandLoot.a commandloot_a) throws CommandSyntaxException {
+         WorldServer worldserver = commandlistenerwrapper.getLevel();
+ 
++        list.removeIf(ItemStack::isEmpty); // CraftBukkit - SPIGOT-6959 Remove empty items for avoid throw an error in new EntityItem
+         list.forEach((itemstack) -> {
+             EntityItem entityitem = new EntityItem(worldserver, vec3d.x, vec3d.y, vec3d.z, itemstack.copy());
+ 

paper-server/patches/sources/net/minecraft/server/commands/CommandReload.patch

@@ -0,0 +1,19 @@
+--- a/net/minecraft/server/commands/CommandReload.java
++++ b/net/minecraft/server/commands/CommandReload.java
+@@ -44,6 +44,16 @@
+         return collection1;
+     }
+ 
++    // CraftBukkit start
++    public static void reload(MinecraftServer minecraftserver) {
++        ResourcePackRepository resourcepackrepository = minecraftserver.getPackRepository();
++        SaveData savedata = minecraftserver.getWorldData();
++        Collection<String> collection = resourcepackrepository.getSelectedIds();
++        Collection<String> collection1 = discoverNewPacks(resourcepackrepository, savedata, collection);
++        minecraftserver.reloadResources(collection1);
++    }
++    // CraftBukkit end
++
+     public static void register(CommandDispatcher<CommandListenerWrapper> commanddispatcher) {
+         commanddispatcher.register((LiteralArgumentBuilder) ((LiteralArgumentBuilder) net.minecraft.commands.CommandDispatcher.literal("reload").requires((commandlistenerwrapper) -> {
+             return commandlistenerwrapper.hasPermission(2);

paper-server/patches/sources/net/minecraft/server/commands/CommandSchedule.patch

@@ -0,0 +1,11 @@
+--- a/net/minecraft/server/commands/CommandSchedule.java
++++ b/net/minecraft/server/commands/CommandSchedule.java
+@@ -58,7 +58,7 @@
+         } else {
+             long j = commandlistenerwrapper.getLevel().getGameTime() + (long) i;
+             MinecraftKey minecraftkey = (MinecraftKey) pair.getFirst();
+-            CustomFunctionCallbackTimerQueue<MinecraftServer> customfunctioncallbacktimerqueue = commandlistenerwrapper.getServer().getWorldData().overworldData().getScheduledEvents();
++            CustomFunctionCallbackTimerQueue<MinecraftServer> customfunctioncallbacktimerqueue = commandlistenerwrapper.getLevel().serverLevelData.overworldData().getScheduledEvents(); // CraftBukkit - SPIGOT-6667: Use world specific function timer
+             Optional<net.minecraft.commands.functions.CommandFunction<CommandListenerWrapper>> optional = ((Either) pair.getSecond()).left();
+             String s;
+ 

paper-server/patches/sources/net/minecraft/server/commands/CommandSetWorldSpawn.patch

@@ -0,0 +1,11 @@
+--- a/net/minecraft/server/commands/CommandSetWorldSpawn.java
++++ b/net/minecraft/server/commands/CommandSetWorldSpawn.java
+@@ -30,7 +30,7 @@
+     private static int setSpawn(CommandListenerWrapper commandlistenerwrapper, BlockPosition blockposition, float f) {
+         WorldServer worldserver = commandlistenerwrapper.getLevel();
+ 
+-        if (worldserver.dimension() != World.OVERWORLD) {
++        if (false && worldserver.dimension() != World.OVERWORLD) { // CraftBukkit - SPIGOT-7649: allow in all worlds
+             commandlistenerwrapper.sendFailure(IChatBaseComponent.translatable("commands.setworldspawn.failure.not_overworld"));
+             return 0;
+         } else {

paper-server/patches/sources/net/minecraft/server/commands/CommandSpawnpoint.patch

@@ -0,0 +1,11 @@
+--- a/net/minecraft/server/commands/CommandSpawnpoint.java
++++ b/net/minecraft/server/commands/CommandSpawnpoint.java
+@@ -41,7 +41,7 @@
+         while (iterator.hasNext()) {
+             EntityPlayer entityplayer = (EntityPlayer) iterator.next();
+ 
+-            entityplayer.setRespawnPosition(resourcekey, blockposition, f, true, false);
++            entityplayer.setRespawnPosition(resourcekey, blockposition, f, true, false, org.bukkit.event.player.PlayerSpawnChangeEvent.Cause.COMMAND); // CraftBukkit
+         }
+ 
+         String s = resourcekey.location().toString();

paper-server/patches/sources/net/minecraft/server/commands/CommandSpreadPlayers.patch

@@ -0,0 +1,20 @@
+--- a/net/minecraft/server/commands/CommandSpreadPlayers.java
++++ b/net/minecraft/server/commands/CommandSpreadPlayers.java
+@@ -93,7 +93,7 @@
+             if (entity instanceof EntityHuman) {
+                 set.add(entity.getTeam());
+             } else {
+-                set.add((Object) null);
++                set.add((ScoreboardTeamBase) null); // CraftBukkit - decompile error
+             }
+         }
+ 
+@@ -203,7 +203,7 @@
+                 commandspreadplayers_a = acommandspreadplayers_a[j++];
+             }
+ 
+-            entity.teleportTo(worldserver, (double) MathHelper.floor(commandspreadplayers_a.x) + 0.5D, (double) commandspreadplayers_a.getSpawnY(worldserver, i), (double) MathHelper.floor(commandspreadplayers_a.z) + 0.5D, Set.of(), entity.getYRot(), entity.getXRot(), true);
++            entity.teleportTo(worldserver, (double) MathHelper.floor(commandspreadplayers_a.x) + 0.5D, (double) commandspreadplayers_a.getSpawnY(worldserver, i), (double) MathHelper.floor(commandspreadplayers_a.z) + 0.5D, Set.of(), entity.getYRot(), entity.getXRot(), true, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.COMMAND); // CraftBukkit - handle teleport reason
+             d1 = Double.MAX_VALUE;
+             CommandSpreadPlayers.a[] acommandspreadplayers_a1 = acommandspreadplayers_a;
+             int k = acommandspreadplayers_a.length;

paper-server/patches/sources/net/minecraft/server/commands/CommandSummon.patch

@@ -0,0 +1,11 @@
+--- a/net/minecraft/server/commands/CommandSummon.java
++++ b/net/minecraft/server/commands/CommandSummon.java
+@@ -67,7 +67,7 @@
+                     ((EntityInsentient) entity).finalizeSpawn(commandlistenerwrapper.getLevel(), commandlistenerwrapper.getLevel().getCurrentDifficultyAt(entity.blockPosition()), EntitySpawnReason.COMMAND, (GroupDataEntity) null);
+                 }
+ 
+-                if (!worldserver.tryAddFreshEntityWithPassengers(entity)) {
++                if (!worldserver.tryAddFreshEntityWithPassengers(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.COMMAND)) { // CraftBukkit - pass a spawn reason of "COMMAND"
+                     throw CommandSummon.ERROR_DUPLICATE_UUID.create();
+                 } else {
+                     return entity;

paper-server/patches/sources/net/minecraft/server/commands/CommandTeleport.patch

@@ -0,0 +1,49 @@
+--- a/net/minecraft/server/commands/CommandTeleport.java
++++ b/net/minecraft/server/commands/CommandTeleport.java
+@@ -31,6 +31,14 @@
+ import net.minecraft.world.phys.Vec2F;
+ import net.minecraft.world.phys.Vec3D;
+ 
++// CraftBukkit start
++import net.minecraft.server.level.EntityPlayer;
++import org.bukkit.Location;
++import org.bukkit.craftbukkit.CraftWorld;
++import org.bukkit.event.entity.EntityTeleportEvent;
++import org.bukkit.event.player.PlayerTeleportEvent;
++// CraftBukkit end
++
+ public class CommandTeleport {
+ 
+     private static final SimpleCommandExceptionType INVALID_POSITION = new SimpleCommandExceptionType(IChatBaseComponent.translatable("commands.teleport.invalidPosition"));
+@@ -167,7 +175,30 @@
+             float f4 = MathHelper.wrapDegrees(f2);
+             float f5 = MathHelper.wrapDegrees(f3);
+ 
+-            if (entity.teleportTo(worldserver, d3, d4, d5, set, f4, f5, true)) {
++            // CraftBukkit start - Teleport event
++            boolean result;
++            if (entity instanceof EntityPlayer player) {
++                result = player.teleportTo(worldserver, d3, d4, d5, set, f4, f5, true, PlayerTeleportEvent.TeleportCause.COMMAND);
++            } else {
++                Location to = new Location(worldserver.getWorld(), d3, d4, d5, f4, f5);
++                EntityTeleportEvent event = new EntityTeleportEvent(entity.getBukkitEntity(), entity.getBukkitEntity().getLocation(), to);
++                worldserver.getCraftServer().getPluginManager().callEvent(event);
++                if (event.isCancelled()) {
++                    return;
++                }
++
++                d3 = to.getX();
++                d4 = to.getY();
++                d5 = to.getZ();
++                f4 = to.getYaw();
++                f5 = to.getPitch();
++                worldserver = ((CraftWorld) to.getWorld()).getHandle();
++
++                result = entity.teleportTo(worldserver, d3, d4, d5, set, f4, f5, true);
++            }
++
++            if (result) {
++                // CraftBukkit end
+                 if (lookat != null) {
+                     lookat.perform(commandlistenerwrapper, entity);
+                 }

paper-server/patches/sources/net/minecraft/server/commands/CommandTime.patch

@@ -0,0 +1,56 @@
+--- a/net/minecraft/server/commands/CommandTime.java
++++ b/net/minecraft/server/commands/CommandTime.java
+@@ -9,6 +9,11 @@
+ import net.minecraft.network.chat.IChatBaseComponent;
+ import net.minecraft.server.level.WorldServer;
+ 
++// CraftBukkit start
++import org.bukkit.Bukkit;
++import org.bukkit.event.world.TimeSkipEvent;
++// CraftBukkit end
++
+ public class CommandTime {
+ 
+     public CommandTime() {}
+@@ -49,12 +54,18 @@
+     }
+ 
+     public static int setTime(CommandListenerWrapper commandlistenerwrapper, int i) {
+-        Iterator iterator = commandlistenerwrapper.getServer().getAllLevels().iterator();
++        Iterator iterator = com.google.common.collect.Iterators.singletonIterator(commandlistenerwrapper.getLevel()); // CraftBukkit - SPIGOT-6496: Only set the time for the world the command originates in
+ 
+         while (iterator.hasNext()) {
+             WorldServer worldserver = (WorldServer) iterator.next();
+ 
+-            worldserver.setDayTime((long) i);
++            // CraftBukkit start
++            TimeSkipEvent event = new TimeSkipEvent(worldserver.getWorld(), TimeSkipEvent.SkipReason.COMMAND, i - worldserver.getDayTime());
++            Bukkit.getPluginManager().callEvent(event);
++            if (!event.isCancelled()) {
++                worldserver.setDayTime((long) worldserver.getDayTime() + event.getSkipAmount());
++            }
++            // CraftBukkit end
+         }
+ 
+         commandlistenerwrapper.getServer().forceTimeSynchronization();
+@@ -65,12 +76,18 @@
+     }
+ 
+     public static int addTime(CommandListenerWrapper commandlistenerwrapper, int i) {
+-        Iterator iterator = commandlistenerwrapper.getServer().getAllLevels().iterator();
++        Iterator iterator = com.google.common.collect.Iterators.singletonIterator(commandlistenerwrapper.getLevel()); // CraftBukkit - SPIGOT-6496: Only set the time for the world the command originates in
+ 
+         while (iterator.hasNext()) {
+             WorldServer worldserver = (WorldServer) iterator.next();
+ 
+-            worldserver.setDayTime(worldserver.getDayTime() + (long) i);
++            // CraftBukkit start
++            TimeSkipEvent event = new TimeSkipEvent(worldserver.getWorld(), TimeSkipEvent.SkipReason.COMMAND, i);
++            Bukkit.getPluginManager().callEvent(event);
++            if (!event.isCancelled()) {
++                worldserver.setDayTime(worldserver.getDayTime() + event.getSkipAmount());
++            }
++            // CraftBukkit end
+         }
+ 
+         commandlistenerwrapper.getServer().forceTimeSynchronization();

paper-server/patches/sources/net/minecraft/server/commands/CommandWeather.patch

@@ -0,0 +1,34 @@
+--- a/net/minecraft/server/commands/CommandWeather.java
++++ b/net/minecraft/server/commands/CommandWeather.java
+@@ -34,11 +34,11 @@
+     }
+ 
+     private static int getDuration(CommandListenerWrapper commandlistenerwrapper, int i, IntProvider intprovider) {
+-        return i == -1 ? intprovider.sample(commandlistenerwrapper.getServer().overworld().getRandom()) : i;
++        return i == -1 ? intprovider.sample(commandlistenerwrapper.getLevel().getRandom()) : i; // CraftBukkit - SPIGOT-7680: per-world
+     }
+ 
+     private static int setClear(CommandListenerWrapper commandlistenerwrapper, int i) {
+-        commandlistenerwrapper.getServer().overworld().setWeatherParameters(getDuration(commandlistenerwrapper, i, WorldServer.RAIN_DELAY), 0, false, false);
++        commandlistenerwrapper.getLevel().setWeatherParameters(getDuration(commandlistenerwrapper, i, WorldServer.RAIN_DELAY), 0, false, false); // CraftBukkit - SPIGOT-7680: per-world
+         commandlistenerwrapper.sendSuccess(() -> {
+             return IChatBaseComponent.translatable("commands.weather.set.clear");
+         }, true);
+@@ -46,7 +46,7 @@
+     }
+ 
+     private static int setRain(CommandListenerWrapper commandlistenerwrapper, int i) {
+-        commandlistenerwrapper.getServer().overworld().setWeatherParameters(0, getDuration(commandlistenerwrapper, i, WorldServer.RAIN_DURATION), true, false);
++        commandlistenerwrapper.getLevel().setWeatherParameters(0, getDuration(commandlistenerwrapper, i, WorldServer.RAIN_DURATION), true, false); // CraftBukkit - SPIGOT-7680: per-world
+         commandlistenerwrapper.sendSuccess(() -> {
+             return IChatBaseComponent.translatable("commands.weather.set.rain");
+         }, true);
+@@ -54,7 +54,7 @@
+     }
+ 
+     private static int setThunder(CommandListenerWrapper commandlistenerwrapper, int i) {
+-        commandlistenerwrapper.getServer().overworld().setWeatherParameters(0, getDuration(commandlistenerwrapper, i, WorldServer.THUNDER_DURATION), true, true);
++        commandlistenerwrapper.getLevel().setWeatherParameters(0, getDuration(commandlistenerwrapper, i, WorldServer.THUNDER_DURATION), true, true); // CraftBukkit - SPIGOT-7680: per-world
+         commandlistenerwrapper.sendSuccess(() -> {
+             return IChatBaseComponent.translatable("commands.weather.set.thunder");
+         }, true);

paper-server/patches/sources/net/minecraft/server/commands/CommandWorldBorder.patch

@@ -0,0 +1,65 @@
+--- a/net/minecraft/server/commands/CommandWorldBorder.java
++++ b/net/minecraft/server/commands/CommandWorldBorder.java
+@@ -57,7 +57,7 @@
+     }
+ 
+     private static int setDamageBuffer(CommandListenerWrapper commandlistenerwrapper, float f) throws CommandSyntaxException {
+-        WorldBorder worldborder = commandlistenerwrapper.getServer().overworld().getWorldBorder();
++        WorldBorder worldborder = commandlistenerwrapper.getLevel().getWorldBorder(); // CraftBukkit
+ 
+         if (worldborder.getDamageSafeZone() == (double) f) {
+             throw CommandWorldBorder.ERROR_SAME_DAMAGE_BUFFER.create();
+@@ -71,7 +71,7 @@
+     }
+ 
+     private static int setDamageAmount(CommandListenerWrapper commandlistenerwrapper, float f) throws CommandSyntaxException {
+-        WorldBorder worldborder = commandlistenerwrapper.getServer().overworld().getWorldBorder();
++        WorldBorder worldborder = commandlistenerwrapper.getLevel().getWorldBorder(); // CraftBukkit
+ 
+         if (worldborder.getDamagePerBlock() == (double) f) {
+             throw CommandWorldBorder.ERROR_SAME_DAMAGE_AMOUNT.create();
+@@ -85,7 +85,7 @@
+     }
+ 
+     private static int setWarningTime(CommandListenerWrapper commandlistenerwrapper, int i) throws CommandSyntaxException {
+-        WorldBorder worldborder = commandlistenerwrapper.getServer().overworld().getWorldBorder();
++        WorldBorder worldborder = commandlistenerwrapper.getLevel().getWorldBorder(); // CraftBukkit
+ 
+         if (worldborder.getWarningTime() == i) {
+             throw CommandWorldBorder.ERROR_SAME_WARNING_TIME.create();
+@@ -99,7 +99,7 @@
+     }
+ 
+     private static int setWarningDistance(CommandListenerWrapper commandlistenerwrapper, int i) throws CommandSyntaxException {
+-        WorldBorder worldborder = commandlistenerwrapper.getServer().overworld().getWorldBorder();
++        WorldBorder worldborder = commandlistenerwrapper.getLevel().getWorldBorder(); // CraftBukkit
+ 
+         if (worldborder.getWarningBlocks() == i) {
+             throw CommandWorldBorder.ERROR_SAME_WARNING_DISTANCE.create();
+@@ -113,7 +113,7 @@
+     }
+ 
+     private static int getSize(CommandListenerWrapper commandlistenerwrapper) {
+-        double d0 = commandlistenerwrapper.getServer().overworld().getWorldBorder().getSize();
++        double d0 = commandlistenerwrapper.getLevel().getWorldBorder().getSize(); // CraftBukkit
+ 
+         commandlistenerwrapper.sendSuccess(() -> {
+             return IChatBaseComponent.translatable("commands.worldborder.get", String.format(Locale.ROOT, "%.0f", d0));
+@@ -122,7 +122,7 @@
+     }
+ 
+     private static int setCenter(CommandListenerWrapper commandlistenerwrapper, Vec2F vec2f) throws CommandSyntaxException {
+-        WorldBorder worldborder = commandlistenerwrapper.getServer().overworld().getWorldBorder();
++        WorldBorder worldborder = commandlistenerwrapper.getLevel().getWorldBorder(); // CraftBukkit
+ 
+         if (worldborder.getCenterX() == (double) vec2f.x && worldborder.getCenterZ() == (double) vec2f.y) {
+             throw CommandWorldBorder.ERROR_SAME_CENTER.create();
+@@ -138,7 +138,7 @@
+     }
+ 
+     private static int setSize(CommandListenerWrapper commandlistenerwrapper, double d0, long i) throws CommandSyntaxException {
+-        WorldBorder worldborder = commandlistenerwrapper.getServer().overworld().getWorldBorder();
++        WorldBorder worldborder = commandlistenerwrapper.getLevel().getWorldBorder(); // CraftBukkit
+         double d1 = worldborder.getSize();
+ 
+         if (d1 == d0) {

paper-server/patches/sources/net/minecraft/server/commands/PlaceCommand.patch

@@ -0,0 +1,10 @@
+--- a/net/minecraft/server/commands/PlaceCommand.java
++++ b/net/minecraft/server/commands/PlaceCommand.java
+@@ -132,6 +132,7 @@
+         if (!structurestart.isValid()) {
+             throw PlaceCommand.ERROR_STRUCTURE_FAILED.create();
+         } else {
++            structurestart.generationEventCause = org.bukkit.event.world.AsyncStructureGenerateEvent.Cause.COMMAND; // CraftBukkit - set AsyncStructureGenerateEvent.Cause.COMMAND as generation cause
+             StructureBoundingBox structureboundingbox = structurestart.getBoundingBox();
+             ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(SectionPosition.blockToSectionCoord(structureboundingbox.minX()), SectionPosition.blockToSectionCoord(structureboundingbox.minZ()));
+             ChunkCoordIntPair chunkcoordintpair1 = new ChunkCoordIntPair(SectionPosition.blockToSectionCoord(structureboundingbox.maxX()), SectionPosition.blockToSectionCoord(structureboundingbox.maxZ()));