More work work work

2023-09-22 14:22:24 +02:00 · 2023-09-22 14:22:24 +02:00 · 79fef73926
commit 79fef73926
parent 00d82983bd
62 changed files with 126 additions and 127 deletions
--- a/patches/unapplied/server/0663-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/unapplied/server/0663-Add-missing-team-sidebar-display-slots.patch
--- a/patches/unapplied/server/0664-Add-back-EntityPortalExitEvent.patch
+++ b/patches/unapplied/server/0664-Add-back-EntityPortalExitEvent.patch
--- a/patches/unapplied/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/unapplied/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch
--- a/patches/unapplied/server/0666-Get-entity-default-attributes.patch
+++ b/patches/unapplied/server/0666-Get-entity-default-attributes.patch
--- a/patches/unapplied/server/0667-Left-handed-API.patch
+++ b/patches/unapplied/server/0667-Left-handed-API.patch
--- a/patches/unapplied/server/0668-Add-more-advancement-API.patch
+++ b/patches/unapplied/server/0668-Add-more-advancement-API.patch
--- a/patches/unapplied/server/0669-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/unapplied/server/0669-Add-ItemFactory-getSpawnEgg-API.patch
--- a/patches/unapplied/server/0640-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/unapplied/server/0640-Don-t-apply-cramming-damage-to-players.patch
@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Phoenix616 <max@themoep.de>
-Date: Sun, 20 Jun 2021 16:35:42 +0100
-Subject: [PATCH] Don't apply cramming damage to players
-
-It does not make a lot of sense to damage players if they get crammed,
- especially as the usecase of teleporting lots of players to the same
- location isn't too uncommon and killing all those players isn't
- really what one would expect to happen.
-
-For those who really want it a config option is provided.
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0a25e2bb95fa249fa5cde1a174702bb311a45171..eaa1b300870f3bbf5a34cb99e6af116b7c244628 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -100,6 +100,7 @@ import net.minecraft.util.Mth;
- import net.minecraft.util.RandomSource;
- import net.minecraft.util.Unit;
- import net.minecraft.world.damagesource.DamageSource;
-+import net.minecraft.world.damagesource.DamageSources;
- import net.minecraft.world.effect.MobEffectInstance;
- import net.minecraft.world.effect.MobEffects;
- import net.minecraft.world.entity.Entity;
-@@ -1472,7 +1473,7 @@ public class ServerPlayer extends Player {
- 
-     @Override
-     public boolean isInvulnerableTo(DamageSource damageSource) {
-        return super.isInvulnerableTo(damageSource) || this.isChangingDimension();
-+        return super.isInvulnerableTo(damageSource) || this.isChangingDimension()  || !this.level().paperConfig().collisions.allowPlayerCrammingDamage && damageSource == damageSources().cramming(); // Paper - disable player cramming
-     }
- 
-     @Override
--- a/patches/unapplied/server/0641-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/unapplied/server/0641-Rate-options-and-timings-for-sensors-and-behaviors.patch
@ -1,134 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Phoenix616 <max@themoep.de>
-Date: Mon, 28 Jun 2021 22:38:29 +0100
-Subject: [PATCH] Rate options and timings for sensors and behaviors
-
-This adds config options to specify the tick rate for sensors
- and behaviors of different entity types as well as timings
- for those in order to be able to have some metrics as to which
- ones might need tweaking.
-
-diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
-index 59affb62cb487d60e8c3e32decf89d6cb7d22f8d..4d861f9a58f8ea238471af22f387854d855b1801 100644
--- a/src/main/java/co/aikar/timings/MinecraftTimings.java
-+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
-@@ -115,6 +115,14 @@ public final class MinecraftTimings {
-         return Timings.ofSafe("Minecraft", "## tickEntity - " + entityType + " - " + type, tickEntityTimer);
-     }
- 
-+    public static Timing getBehaviorTimings(String type) {
-+        return Timings.ofSafe("## Behavior - " + type);
-+    }
-+
-+    public static Timing getSensorTimings(String type, int rate) {
-+        return Timings.ofSafe("## Sensor - " + type + " (Default rate: " + rate + ")");
-+    }
-+
-     /**
-      * Get a named timer for the specified tile entity type to track type specific timings.
-      * @param entity
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java b/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java
-index 4ea437253539e3ee533ca9da77a337cbf4d1e807..57ef7fbba3028c28231abf7b7ae78aa019323536 100644
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java
-@@ -13,6 +13,10 @@ public abstract class Behavior<E extends LivingEntity> implements BehaviorContro
-     private long endTimestamp;
-     private final int minDuration;
-     private final int maxDuration;
-+    // Paper start - configurable behavior tick rate and timings
-+    private final String configKey;
-+    private final co.aikar.timings.Timing timing;
-+    // Paper end
- 
-     public Behavior(Map<MemoryModuleType<?>, MemoryStatus> requiredMemoryState) {
-         this(requiredMemoryState, 60);
-@@ -26,6 +30,15 @@ public abstract class Behavior<E extends LivingEntity> implements BehaviorContro
-         this.minDuration = minRunTime;
-         this.maxDuration = maxRunTime;
-         this.entryCondition = requiredMemoryState;
-+        // Paper start - configurable behavior tick rate and timings
-+        String key = io.papermc.paper.util.ObfHelper.INSTANCE.deobfClassName(this.getClass().getName());
-+        int lastSeparator = key.lastIndexOf('.');
-+        if (lastSeparator != -1) {
-+            key = key.substring(lastSeparator + 1);
-+        }
-+        this.configKey = key.toLowerCase(java.util.Locale.ROOT);
-+        this.timing = co.aikar.timings.MinecraftTimings.getBehaviorTimings(configKey);
-+        // Paper end
-     }
- 
-     @Override
-@@ -35,11 +48,19 @@ public abstract class Behavior<E extends LivingEntity> implements BehaviorContro
- 
-     @Override
-     public final boolean tryStart(ServerLevel world, E entity, long time) {
-+        // Paper start - behavior tick rate
-+        int tickRate = java.util.Objects.requireNonNullElse(world.paperConfig().tickRates.behavior.get(entity.getType(), this.configKey), -1);
-+        if (tickRate > -1 && time < this.endTimestamp + tickRate) {
-+            return false;
-+        }
-+        // Paper end
-         if (this.hasRequiredMemories(entity) && this.checkExtraStartConditions(world, entity)) {
-             this.status = Behavior.Status.RUNNING;
-             int i = this.minDuration + world.getRandom().nextInt(this.maxDuration + 1 - this.minDuration);
-             this.endTimestamp = time + (long)i;
-+            this.timing.startTiming(); // Paper - behavior timings
-             this.start(world, entity, time);
-+            this.timing.stopTiming(); // Paper - behavior timings
-             return true;
-         } else {
-             return false;
-@@ -51,11 +72,13 @@ public abstract class Behavior<E extends LivingEntity> implements BehaviorContro
- 
-     @Override
-     public final void tickOrStop(ServerLevel world, E entity, long time) {
-+        this.timing.startTiming(); // Paper - behavior timings
-         if (!this.timedOut(time) && this.canStillUse(world, entity, time)) {
-             this.tick(world, entity, time);
-         } else {
-             this.doStop(world, entity, time);
-         }
-+        this.timing.stopTiming(); // Paper - behavior timings
- 
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java
-index 7970eebbd6935402223e6bba962bb8ba7d861dfd..fcdb9bde8e1605e30dde3e580491522d4b62cdc0 100644
--- a/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java
-@@ -19,8 +19,21 @@ public abstract class Sensor<E extends LivingEntity> {
-     private static final TargetingConditions ATTACK_TARGET_CONDITIONS_IGNORE_INVISIBILITY_AND_LINE_OF_SIGHT = TargetingConditions.forCombat().range(16.0D).ignoreLineOfSight().ignoreInvisibilityTesting();
-     private final int scanRate;
-     private long timeToTick;
-+    // Paper start - configurable sensor tick rate and timings
-+    private final String configKey;
-+    private final co.aikar.timings.Timing timing;
-+    // Paper end
- 
-     public Sensor(int senseInterval) {
-+        // Paper start - configurable sensor tick rate and timings
-+        String key = io.papermc.paper.util.ObfHelper.INSTANCE.deobfClassName(this.getClass().getName());
-+        int lastSeparator = key.lastIndexOf('.');
-+        if (lastSeparator != -1) {
-+            key = key.substring(lastSeparator + 1);
-+        }
-+        this.configKey = key.toLowerCase(java.util.Locale.ROOT);
-+        this.timing = co.aikar.timings.MinecraftTimings.getSensorTimings(configKey, senseInterval);
-+        // Paper end
-         this.scanRate = senseInterval;
-         this.timeToTick = (long)RANDOM.nextInt(senseInterval);
-     }
-@@ -31,8 +44,12 @@ public abstract class Sensor<E extends LivingEntity> {
- 
-     public final void tick(ServerLevel world, E entity) {
-         if (--this.timeToTick <= 0L) {
-            this.timeToTick = (long)this.scanRate;
-+            // Paper start - configurable sensor tick rate and timings
-+            this.timeToTick = java.util.Objects.requireNonNullElse(world.paperConfig().tickRates.sensor.get(entity.getType(), this.configKey), this.scanRate);
-+            this.timing.startTiming();
-+            // Paper end
-             this.doTick(world, entity);
-+            this.timing.stopTiming(); // Paper - sensor timings
-         }
- 
-     }
--- a/patches/unapplied/server/0642-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/unapplied/server/0642-Add-a-bunch-of-missing-forceDrop-toggles.patch
@ -1,106 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Tue, 20 Jul 2021 21:25:35 -0700
-Subject: [PATCH] Add a bunch of missing forceDrop toggles
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java b/src/main/java/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java
-index ac0cfdef53ec82665acf362235842de4f17bfdd1..05c1e8c9f013547d4fcdbbd299329166a8ece1b0 100644
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java
-@@ -87,7 +87,9 @@ public class WorkAtComposter extends WorkAtPoi {
-                 simpleContainer.removeItemType(Items.WHEAT, m);
-                 ItemStack itemStack = simpleContainer.addItem(new ItemStack(Items.BREAD, l));
-                 if (!itemStack.isEmpty()) {
-+                    entity.forceDrops = true; // Paper
-                     entity.spawnAtLocation(itemStack, 0.5F);
-+                    entity.forceDrops = false; // Paper
-                 }
- 
-             }
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index a190826d87ca5e05c408ef488986a29280b1b3d2..4f03e50d8d9d67aa9a62fbb3bdb14f5ba851e08a 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-@@ -531,7 +531,9 @@ public class Panda extends Animal {
-         }
- 
-         if (!this.level().isClientSide() && this.random.nextInt(700) == 0 && this.level().getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
-+            this.forceDrops = true; // Paper
-             this.spawnAtLocation((ItemLike) Items.SLIME_BALL);
-+            this.forceDrops = false; // Paper
-         }
- 
-     }
-@@ -655,7 +657,9 @@ public class Panda extends Animal {
-                 ItemStack itemstack1 = this.getItemBySlot(EquipmentSlot.MAINHAND);
- 
-                 if (!itemstack1.isEmpty() && !player.getAbilities().instabuild) {
-+                    this.forceDrops = true; // Paper
-                     this.spawnAtLocation(itemstack1);
-+                    this.forceDrops = false; // Paper
-                 }
- 
-                 this.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(itemstack.getItem(), 1));
-@@ -932,7 +936,9 @@ public class Panda extends Animal {
-             ItemStack itemstack = Panda.this.getItemBySlot(EquipmentSlot.MAINHAND);
- 
-             if (!itemstack.isEmpty()) {
-+                Panda.this.forceDrops = true; // Paper
-                 Panda.this.spawnAtLocation(itemstack);
-+                Panda.this.forceDrops = false; // Paper
-                 Panda.this.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
-                 int i = Panda.this.isLazy() ? Panda.this.random.nextInt(50) + 10 : Panda.this.random.nextInt(150) + 10;
- 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index 2c012e8d314e8b785300de3f810f95c7452b7348..7ef04ef7995b093eef022b397cda8c27c8faede0 100644
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-@@ -322,7 +322,9 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
-     @Override
-     protected void finishConversion(ServerLevel world) {
-         PiglinAi.cancelAdmiring(this);
-+        this.forceDrops = true; // Paper
-         this.inventory.removeAllItems().forEach(this::spawnAtLocation);
-+        this.forceDrops = false; // Paper
-         super.finishConversion(world);
-     }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-index 7611481c7e469a3b9eb4d00f4816adb7b190127e..092cdb889564903102dccfe7bf2e320a1eba5efe 100644
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-@@ -270,7 +270,9 @@ public class PiglinAi {
- 
-     private static void holdInOffhand(Piglin piglin, ItemStack stack) {
-         if (PiglinAi.isHoldingItemInOffHand(piglin)) {
-+            piglin.forceDrops = true; // Paper
-             piglin.spawnAtLocation(piglin.getItemInHand(InteractionHand.OFF_HAND));
-+            piglin.forceDrops = false; // Paper
-         }
- 
-         piglin.holdInOffHand(stack);
-@@ -330,7 +332,9 @@ public class PiglinAi {
- 
-     protected static void cancelAdmiring(Piglin piglin) {
-         if (PiglinAi.isAdmiringItem(piglin) && !piglin.getOffhandItem().isEmpty()) {
-+            piglin.forceDrops = true; // Paper
-             piglin.spawnAtLocation(piglin.getOffhandItem());
-+            piglin.forceDrops = false; // Paper
-             piglin.setItemInHand(InteractionHand.OFF_HAND, ItemStack.EMPTY);
-         }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
-index 06d4c1787b1ee4976e6ed1773d3ff7130aebc2d0..9948085f51659f9b896622251739343d658dd0b2 100644
--- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
-+++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java
-@@ -250,7 +250,9 @@ public abstract class Raider extends PatrollingMonster {
-             double d0 = (double) this.getEquipmentDropChance(enumitemslot);
- 
-             if (!itemstack1.isEmpty() && (double) Math.max(this.random.nextFloat() - 0.1F, 0.0F) < d0) {
-+                this.forceDrops = true; // Paper
-                 this.spawnAtLocation(itemstack1);
-+                this.forceDrops = false; // Paper
-             }
- 
-             this.onItemPickup(item);
--- a/patches/unapplied/server/0643-Stinger-API.patch
+++ b/patches/unapplied/server/0643-Stinger-API.patch
@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Tue, 22 Jun 2021 23:15:44 -0400
-Subject: [PATCH] Stinger API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index a2865fe8fdc5f77a84e72f516d8f1fd1b4b579e0..a235247fe0d8ec50d374ec30007fea8427de9cae 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -338,7 +338,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-         }
-         // Paper end
-     }
-+    // Paper Start - Bee Stinger API
-+    @Override
-+    public int getBeeStingerCooldown() {
-+        return getHandle().removeStingerTime;
-+    }
-+
-+    @Override
-+    public void setBeeStingerCooldown(int ticks) {
-+        getHandle().removeStingerTime = ticks;
-+    }
- 
-+    @Override
-+    public int getBeeStingersInBody() {
-+        return getHandle().getStingerCount();
-+    }
-+
-+    @Override
-+    public void setBeeStingersInBody(int count) {
-+        Preconditions.checkArgument(count >= 0, "New bee stinger amount must be >= 0");
-+        getHandle().setStingerCount(count);
-+    }
-+    // Paper End - Bee Stinger API
-     @Override
-     public void damage(double amount) {
-         this.damage(amount, null);
--- a/patches/unapplied/server/0644-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/unapplied/server/0644-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 1 Aug 2021 09:49:06 +0100
-Subject: [PATCH] Fix incosistency issue with empty map items in CB
-
-
-diff --git a/src/main/java/net/minecraft/world/item/MapItem.java b/src/main/java/net/minecraft/world/item/MapItem.java
-index 75b110c6fb685390306fe3b8504aeea9bd6deedd..d3c29e6bf8b3c2dd628809177dac50220a7de415 100644
--- a/src/main/java/net/minecraft/world/item/MapItem.java
-+++ b/src/main/java/net/minecraft/world/item/MapItem.java
-@@ -73,7 +73,7 @@ public class MapItem extends ComplexItem {
-     public static Integer getMapId(ItemStack stack) {
-         CompoundTag nbttagcompound = stack.getTag();
- 
-        return nbttagcompound != null && nbttagcompound.contains("map", 99) ? nbttagcompound.getInt("map") : -1; // CraftBukkit - make new maps for no tag
-+        return nbttagcompound != null && nbttagcompound.contains("map", 99) ? nbttagcompound.getInt("map") : null; // CraftBukkit - make new maps for no tag // Paper - don't return invalid ID
-     }
- 
-     public static int createNewSavedData(Level world, int x, int z, int scale, boolean showIcons, boolean unlimitedTracking, ResourceKey<Level> dimension) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java
-index 70b365afc40f11d4da3aea2b5d6b2467f517deac..a74ea06e3a190916527ab2c85d13f1e34c08d50a 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java
-@@ -133,6 +133,7 @@ class CraftMetaMap extends CraftMetaItem implements MapMeta {
- 
-     @Override
-     public int getMapId() {
-+        Preconditions.checkState(this.hasMapView(), "Item does not have map associated - check hasMapView() first!"); // Paper - more friendly message
-         return this.mapId;
-     }
- 
--- a/patches/unapplied/server/0645-Add-System.out-err-catcher.patch
+++ b/patches/unapplied/server/0645-Add-System.out-err-catcher.patch
@ -1,118 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: underscore11code <minecrafter11mrt@gmail.com>
-Date: Fri, 23 Jul 2021 23:01:42 -0700
-Subject: [PATCH] Add System.out/err catcher
-
-
-diff --git a/src/main/java/io/papermc/paper/logging/SysoutCatcher.java b/src/main/java/io/papermc/paper/logging/SysoutCatcher.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bdcf128531
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/logging/SysoutCatcher.java
-@@ -0,0 +1,94 @@
-+package io.papermc.paper.logging;
-+
-+import org.bukkit.Bukkit;
-+import org.bukkit.plugin.java.JavaPlugin;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+import java.io.OutputStream;
-+import java.io.PrintStream;
-+import java.util.Objects;
-+import java.util.concurrent.ConcurrentHashMap;
-+import java.util.concurrent.ConcurrentMap;
-+import java.util.concurrent.TimeUnit;
-+import java.util.logging.Level;
-+
-+public final class SysoutCatcher {
-+    private static final boolean SUPPRESS_NAGS = Boolean.getBoolean("io.papermc.paper.suppress.sout.nags");
-+    // Nanoseconds between nag at most; if interval is caught first, this is reset.
-+    // <= 0 for disabling.
-+    private static final long NAG_TIMEOUT = TimeUnit.MILLISECONDS.toNanos(
-+        Long.getLong("io.papermc.paper.sout.nags.timeout", TimeUnit.MINUTES.toMillis(5L)));
-+    // Count since last nag; if timeout is first, this is reset.
-+    // <= 0 for disabling.
-+    private static final long NAG_INTERVAL = Long.getLong("io.papermc.paper.sout.nags.interval", 200L);
-+
-+    // We don't particularly care about how correct this is at any given moment; let's do it on a best attempt basis.
-+    // The records are also pretty small, so let's just go for a size of 64 to start...
-+    //
-+    // Content: Plugin name => nag object
-+    //  Why plugin name?: This doesn't store a reference to the plugin; keeps the reload ability.
-+    //  Why not clean on reload?: Effort.
-+    private final ConcurrentMap<String, PluginNag> nagRecords = new ConcurrentHashMap<>(64);
-+
-+    public SysoutCatcher() {
-+        System.setOut(new WrappedOutStream(System.out, Level.INFO, "[STDOUT] "));
-+        System.setErr(new WrappedOutStream(System.err, Level.SEVERE, "[STDERR] "));
-+    }
-+
-+    private final class WrappedOutStream extends PrintStream {
-+        private static final StackWalker STACK_WALKER = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE);
-+        private final Level level;
-+        private final String prefix;
-+
-+        public WrappedOutStream(@NotNull final OutputStream out, final Level level, final String prefix) {
-+            super(out);
-+            this.level = level;
-+            this.prefix = prefix;
-+        }
-+
-+        @Override
-+        public void println(@Nullable final String line) {
-+            final Class<?> clazz = STACK_WALKER.getCallerClass();
-+            try {
-+                final JavaPlugin plugin = JavaPlugin.getProvidingPlugin(clazz);
-+
-+                // Instead of just printing the message, send it to the plugin's logger
-+                plugin.getLogger().log(this.level, this.prefix + line);
-+
-+                if (SysoutCatcher.SUPPRESS_NAGS) {
-+                    return;
-+                }
-+                if (SysoutCatcher.NAG_INTERVAL > 0 || SysoutCatcher.NAG_TIMEOUT > 0) {
-+                    final PluginNag nagRecord = SysoutCatcher.this.nagRecords.computeIfAbsent(plugin.getName(), k -> new PluginNag());
-+                    final boolean hasTimePassed = SysoutCatcher.NAG_TIMEOUT > 0
-+                        && (nagRecord.lastNagTimestamp == Long.MIN_VALUE
-+                        || nagRecord.lastNagTimestamp + SysoutCatcher.NAG_TIMEOUT <= System.nanoTime());
-+                    final boolean hasMessagesPassed = SysoutCatcher.NAG_INTERVAL > 0
-+                        && (nagRecord.messagesSinceNag == Long.MIN_VALUE
-+                        || ++nagRecord.messagesSinceNag >= SysoutCatcher.NAG_INTERVAL);
-+                    if (!hasMessagesPassed && !hasTimePassed) {
-+                        return;
-+                    }
-+                    nagRecord.lastNagTimestamp = System.nanoTime();
-+                    nagRecord.messagesSinceNag = 0;
-+                }
-+                Bukkit.getLogger().warning(
-+                    String.format("Nag author(s): '%s' of '%s' about their usage of System.out/err.print. "
-+                            + "Please use your plugin's logger instead (JavaPlugin#getLogger).",
-+                        plugin.getPluginMeta().getAuthors(),
-+                        plugin.getPluginMeta().getDisplayName())
-+                );
-+            } catch (final IllegalArgumentException | IllegalStateException e) {
-+                // If anything happens, the calling class doesn't exist, there is no JavaPlugin that "owns" the calling class, etc
-+                // Just print out normally, with some added information
-+                Bukkit.getLogger().log(this.level, String.format("%s[%s] %s", this.prefix, clazz.getName(), line));
-+            }
-+        }
-+    }
-+
-+    private static class PluginNag {
-+        private long lastNagTimestamp = Long.MIN_VALUE;
-+        private long messagesSinceNag = Long.MIN_VALUE;
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 492642f3fad94a0770c94d2090f51a3bdd57638c..1ed8ced7f72af6a135718e4a06dd46ce352361a7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -303,6 +303,7 @@ public final class CraftServer implements Server {
-     public int reloadCount;
-     private final io.papermc.paper.datapack.PaperDatapackManager datapackManager; // Paper
-     public static Exception excessiveVelEx; // Paper - Velocity warnings
-+    private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
- 
-     static {
-         ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
--- a/patches/unapplied/server/0646-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/unapplied/server/0646-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
@ -1,246 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SirYwell <hannesgreule@outlook.de>
-Date: Sat, 10 Jul 2021 11:12:30 +0200
-Subject: [PATCH] Rewrite LogEvents to contain the source jars in stack traces
-
-
-diff --git a/src/log4jPlugins/java/io/papermc/paper/logging/DelegateLogEvent.java b/src/log4jPlugins/java/io/papermc/paper/logging/DelegateLogEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..6ffd1befe64c6c3036c22e05ed1c44808d64bd28
--- /dev/null
-+++ b/src/log4jPlugins/java/io/papermc/paper/logging/DelegateLogEvent.java
-@@ -0,0 +1,130 @@
-+package io.papermc.paper.logging;
-+
-+import org.apache.logging.log4j.Level;
-+import org.apache.logging.log4j.Marker;
-+import org.apache.logging.log4j.ThreadContext;
-+import org.apache.logging.log4j.core.LogEvent;
-+import org.apache.logging.log4j.core.impl.ThrowableProxy;
-+import org.apache.logging.log4j.core.time.Instant;
-+import org.apache.logging.log4j.message.Message;
-+import org.apache.logging.log4j.util.ReadOnlyStringMap;
-+
-+import java.util.Map;
-+
-+public class DelegateLogEvent implements LogEvent {
-+    private final LogEvent original;
-+
-+    protected DelegateLogEvent(LogEvent original) {
-+        this.original = original;
-+    }
-+
-+    @Override
-+    public LogEvent toImmutable() {
-+        return this.original.toImmutable();
-+    }
-+
-+    @Override
-+    public Map<String, String> getContextMap() {
-+        return this.original.getContextMap();
-+    }
-+
-+    @Override
-+    public ReadOnlyStringMap getContextData() {
-+        return this.original.getContextData();
-+    }
-+
-+    @Override
-+    public ThreadContext.ContextStack getContextStack() {
-+        return this.original.getContextStack();
-+    }
-+
-+    @Override
-+    public String getLoggerFqcn() {
-+        return this.original.getLoggerFqcn();
-+    }
-+
-+    @Override
-+    public Level getLevel() {
-+        return this.original.getLevel();
-+    }
-+
-+    @Override
-+    public String getLoggerName() {
-+        return this.original.getLoggerName();
-+    }
-+
-+    @Override
-+    public Marker getMarker() {
-+        return this.original.getMarker();
-+    }
-+
-+    @Override
-+    public Message getMessage() {
-+        return this.original.getMessage();
-+    }
-+
-+    @Override
-+    public long getTimeMillis() {
-+        return this.original.getTimeMillis();
-+    }
-+
-+    @Override
-+    public Instant getInstant() {
-+        return this.original.getInstant();
-+    }
-+
-+    @Override
-+    public StackTraceElement getSource() {
-+        return this.original.getSource();
-+    }
-+
-+    @Override
-+    public String getThreadName() {
-+        return this.original.getThreadName();
-+    }
-+
-+    @Override
-+    public long getThreadId() {
-+        return this.original.getThreadId();
-+    }
-+
-+    @Override
-+    public int getThreadPriority() {
-+        return this.original.getThreadPriority();
-+    }
-+
-+    @Override
-+    public Throwable getThrown() {
-+        return this.original.getThrown();
-+    }
-+
-+    @Override
-+    public ThrowableProxy getThrownProxy() {
-+        return this.original.getThrownProxy();
-+    }
-+
-+    @Override
-+    public boolean isEndOfBatch() {
-+        return this.original.isEndOfBatch();
-+    }
-+
-+    @Override
-+    public boolean isIncludeLocation() {
-+        return this.original.isIncludeLocation();
-+    }
-+
-+    @Override
-+    public void setEndOfBatch(boolean endOfBatch) {
-+        this.original.setEndOfBatch(endOfBatch);
-+    }
-+
-+    @Override
-+    public void setIncludeLocation(boolean locationRequired) {
-+        this.original.setIncludeLocation(locationRequired);
-+    }
-+
-+    @Override
-+    public long getNanoTime() {
-+        return this.original.getNanoTime();
-+    }
-+}
-diff --git a/src/log4jPlugins/java/io/papermc/paper/logging/ExtraClassInfoLogEvent.java b/src/log4jPlugins/java/io/papermc/paper/logging/ExtraClassInfoLogEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..558427c65b4051923f73d15d85ee519be005060a
--- /dev/null
-+++ b/src/log4jPlugins/java/io/papermc/paper/logging/ExtraClassInfoLogEvent.java
-@@ -0,0 +1,48 @@
-+package io.papermc.paper.logging;
-+
-+import org.apache.logging.log4j.core.LogEvent;
-+import org.apache.logging.log4j.core.impl.ExtendedClassInfo;
-+import org.apache.logging.log4j.core.impl.ExtendedStackTraceElement;
-+import org.apache.logging.log4j.core.impl.ThrowableProxy;
-+
-+public class ExtraClassInfoLogEvent extends DelegateLogEvent {
-+
-+    private boolean fixed;
-+
-+    public ExtraClassInfoLogEvent(LogEvent original) {
-+        super(original);
-+    }
-+
-+    @Override
-+    public ThrowableProxy getThrownProxy() {
-+        if (fixed) {
-+            return super.getThrownProxy();
-+        }
-+        rewriteStackTrace(super.getThrownProxy());
-+        fixed = true;
-+        return super.getThrownProxy();
-+    }
-+
-+    private void rewriteStackTrace(ThrowableProxy throwable) {
-+        ExtendedStackTraceElement[] stackTrace = throwable.getExtendedStackTrace();
-+        for (int i = 0; i < stackTrace.length; i++) {
-+            ExtendedClassInfo classInfo = stackTrace[i].getExtraClassInfo();
-+            if (classInfo.getLocation().equals("?")) {
-+                StackTraceElement element = stackTrace[i].getStackTraceElement();
-+                String classLoaderName = element.getClassLoaderName();
-+                if (classLoaderName != null) {
-+                    stackTrace[i] = new ExtendedStackTraceElement(element,
-+                        new ExtendedClassInfo(classInfo.getExact(), classLoaderName, "?"));
-+                }
-+            }
-+        }
-+        if (throwable.getCauseProxy() != null) {
-+            rewriteStackTrace(throwable.getCauseProxy());
-+        }
-+        if (throwable.getSuppressedProxies() != null) {
-+            for (ThrowableProxy proxy : throwable.getSuppressedProxies()) {
-+                rewriteStackTrace(proxy);
-+            }
-+        }
-+    }
-+}
-diff --git a/src/log4jPlugins/java/io/papermc/paper/logging/ExtraClassInfoRewritePolicy.java b/src/log4jPlugins/java/io/papermc/paper/logging/ExtraClassInfoRewritePolicy.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..34734bb969a1a74c7a4f9c17d40ebf007ad5d701
--- /dev/null
-+++ b/src/log4jPlugins/java/io/papermc/paper/logging/ExtraClassInfoRewritePolicy.java
-@@ -0,0 +1,29 @@
-+package io.papermc.paper.logging;
-+
-+import org.apache.logging.log4j.core.Core;
-+import org.apache.logging.log4j.core.LogEvent;
-+import org.apache.logging.log4j.core.appender.rewrite.RewritePolicy;
-+import org.apache.logging.log4j.core.config.plugins.Plugin;
-+import org.apache.logging.log4j.core.config.plugins.PluginFactory;
-+import org.jetbrains.annotations.NotNull;
-+
-+@Plugin(
-+    name = "ExtraClassInfoRewritePolicy",
-+    category = Core.CATEGORY_NAME,
-+    elementType = "rewritePolicy",
-+    printObject = true
-+)
-+public final class ExtraClassInfoRewritePolicy implements RewritePolicy {
-+    @Override
-+    public LogEvent rewrite(LogEvent source) {
-+        if (source.getThrown() != null) {
-+            return new ExtraClassInfoLogEvent(source);
-+        }
-+        return source;
-+    }
-+
-+    @PluginFactory
-+    public static @NotNull ExtraClassInfoRewritePolicy createPolicy() {
-+        return new ExtraClassInfoRewritePolicy();
-+    }
-+}
-diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 2b247d55e39246fbef31279b14c45fc40f956bfb..675cd61221e807aadf28322b46c3daa1370241b5 100644
--- a/src/main/resources/log4j2.xml
-+++ b/src/main/resources/log4j2.xml
-@@ -34,6 +34,10 @@
-         </Async>
-         <Rewrite name="rewrite">
-             <StacktraceDeobfuscatingRewritePolicy />
-+            <AppenderRef ref="rewrite2"/>
-+        </Rewrite>
-+        <Rewrite name="rewrite2">
-+            <ExtraClassInfoRewritePolicy />
-             <AppenderRef ref="File"/>
-             <AppenderRef ref="TerminalConsole" level="info"/>
-             <AppenderRef ref="ServerGuiConsole" level="info"/>
--- a/patches/unapplied/server/0647-Improve-boat-collision-performance.patch
+++ b/patches/unapplied/server/0647-Improve-boat-collision-performance.patch
@ -1,70 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Mon, 2 Aug 2021 10:10:40 +0200
-Subject: [PATCH] Improve boat collision performance
-
-
-diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index 7354711e194ab58b11b68f447c1fc795fe611a65..5579dad0ba8f2e4ce43883e7d36059c2a2bd1b83 100644
--- a/src/main/java/net/minecraft/Util.java
-+++ b/src/main/java/net/minecraft/Util.java
-@@ -113,6 +113,7 @@ public class Util {
-     }).findFirst().orElseThrow(() -> {
-         return new IllegalStateException("No jar file system provider found");
-     });
-+    public static final double COLLISION_EPSILON = 1.0E-7; // Paper
-     private static Consumer<String> thePauser = (message) -> {
-     };
- 
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 463ae3d9e75b32da0aa91ebbbf1a34ee74825224..693fe96b508a78545c180dda8ab40d6456896db4 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1382,7 +1382,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-                 if (!source.is(DamageTypeTags.IS_PROJECTILE)) {
-                     Entity entity = source.getDirectEntity();
- 
-                    if (entity instanceof LivingEntity) {
-+                    if (entity instanceof LivingEntity && entity.distanceToSqr(this) <= (200.0D * 200.0D)) { // Paper
-                         LivingEntity entityliving = (LivingEntity) entity;
- 
-                         this.blockUsingShield(entityliving);
-@@ -1478,11 +1478,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
-                 }
- 
-                 if (entity1 != null && !source.is(DamageTypeTags.IS_EXPLOSION)) {
-                    double d0 = entity1.getX() - this.getX();
-+                    final boolean far = entity1.distanceToSqr(this) > (200.0 * 200.0); // Paper
-+                    double d0 = far ? (Math.random() - Math.random()) : entity1.getX() - this.getX(); // Paper
- 
-                     double d1;
- 
-                    for (d1 = entity1.getZ() - this.getZ(); d0 * d0 + d1 * d1 < 1.0E-4D; d1 = (Math.random() - Math.random()) * 0.01D) {
-+                    for (d1 = far ? Math.random() - Math.random() : entity1.getZ() - this.getZ(); d0 * d0 + d1 * d1 < 1.0E-4D; d1 = (Math.random() - Math.random()) * 0.01D) { // Paper
-                         d0 = (Math.random() - Math.random()) * 0.01D;
-                     }
- 
-@@ -2213,7 +2214,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-                 this.hurtCurrentlyUsedShield((float) -event.getDamage(DamageModifier.BLOCKING));
-                 Entity entity = damagesource.getDirectEntity();
- 
-                if (entity instanceof LivingEntity) {
-+                if (entity instanceof LivingEntity && entity.distanceToSqr(this) <= (200.0D * 200.0D)) { // Paper
-                     this.blockUsingShield((LivingEntity) entity);
-                 }
-             }
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-index a459a7889c7462b9c8e6474d987151f15720a98e..2c5658df753ebc08f8531d4bdf22ff8f6ca77e94 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-@@ -709,8 +709,8 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
-         this.invFriction = 0.05F;
-         if (this.oldStatus == Boat.Status.IN_AIR && this.status != Boat.Status.IN_AIR && this.status != Boat.Status.ON_LAND) {
-             this.waterLevel = this.getY(1.0D);
-            this.setPos(this.getX(), (double) (this.getWaterLevelAbove() - this.getBbHeight()) + 0.101D, this.getZ());
-            this.setDeltaMovement(this.getDeltaMovement().multiply(1.0D, 0.0D, 1.0D));
-+            this.move(MoverType.SELF, new Vec3(0.0, ((double) (this.getWaterLevelAbove() - this.getBbHeight()) + 0.101D) - this.getY(), 0.0)); // Paper
-+            this.setDeltaMovement(this.getDeltaMovement().multiply(1.0D, 0.0D, 1.0D)); // Paper
-             this.lastYd = 0.0D;
-             this.status = Boat.Status.IN_WATER;
-         } else {
--- a/patches/unapplied/server/0648-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/unapplied/server/0648-Prevent-AFK-kick-while-watching-end-credits.patch
@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Noah van der Aa <ndvdaa@gmail.com>
-Date: Sat, 24 Jul 2021 16:54:11 +0200
-Subject: [PATCH] Prevent AFK kick while watching end credits.
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9d519076d8ae50ab04c1a3c83c92b6d127a11321..96a414a09e125ca0ea3ccf2589abf47a39fad92d 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -433,7 +433,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-             --this.dropSpamTickCount;
-         }
- 
-        if (this.player.getLastActionTime() > 0L && this.server.getPlayerIdleTimeout() > 0 && Util.getMillis() - this.player.getLastActionTime() > (long) this.server.getPlayerIdleTimeout() * 1000L * 60L) {
-+        if (this.player.getLastActionTime() > 0L && this.server.getPlayerIdleTimeout() > 0 && Util.getMillis() - this.player.getLastActionTime() > (long) this.server.getPlayerIdleTimeout() * 1000L * 60L && !this.player.wonGame) { // Paper - Prevent AFK kick while watching end credits.
-             this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854
-             this.disconnect(Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause
-         }
--- a/patches/unapplied/server/0649-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/unapplied/server/0649-Allow-skipping-writing-of-comments-to-server.propert.patch
@ -1,69 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Professor Bloodstone <git@bloodstone.dev>
-Date: Fri, 23 Jul 2021 02:32:04 +0200
-Subject: [PATCH] Allow skipping writing of comments to server.properties
-
-Makes less git noise, as it won't update the date every single time
-
-Use -DPaper.skipServerPropertiesComments=true flag to disable writing it
-
-diff --git a/src/main/java/net/minecraft/server/dedicated/Settings.java b/src/main/java/net/minecraft/server/dedicated/Settings.java
-index ca23639f15107ccd43b874ae38fa37279b827a8f..faca42b2b5b20559f98c300b7011b67165391a0d 100644
--- a/src/main/java/net/minecraft/server/dedicated/Settings.java
-+++ b/src/main/java/net/minecraft/server/dedicated/Settings.java
-@@ -29,6 +29,7 @@ public abstract class Settings<T extends Settings<T>> {
- 
-     private static final Logger LOGGER = LogUtils.getLogger();
-     public final Properties properties;
-+    private static final boolean skipComments = Boolean.getBoolean("Paper.skipServerPropertiesComments"); // Paper - allow skipping server.properties comments
-     // CraftBukkit start
-     private OptionSet options = null;
- 
-@@ -123,7 +124,46 @@ public abstract class Settings<T extends Settings<T>> {
-                 return;
-             }
-             // CraftBukkit end
-            BufferedWriter bufferedwriter = Files.newBufferedWriter(path, StandardCharsets.UTF_8);
-+            // Paper start - disable writing comments to properties file
-+            java.io.OutputStream outputstream = Files.newOutputStream(path);
-+            java.io.BufferedOutputStream bufferedOutputStream =  !skipComments ? new java.io.BufferedOutputStream(outputstream) : new java.io.BufferedOutputStream(outputstream) {
-+                private boolean isRightAfterNewline = true; // If last written char was newline
-+                private boolean isComment = false; // Are we writing comment currently?
-+
-+                @Override
-+                public void write(@org.jetbrains.annotations.NotNull byte[] b) throws IOException {
-+                    this.write(b, 0, b.length);
-+                }
-+
-+                @Override
-+                public void write(@org.jetbrains.annotations.NotNull byte[] bbuf, int off, int len) throws IOException {
-+                    int latest_offset = off; // The latest offset, updated when comment ends
-+                    for (int index = off; index < off + len; ++index ) {
-+                        byte c = bbuf[index];
-+                        boolean isNewline = (c == '\n' || c == '\r');
-+                        if (isNewline && this.isComment) {
-+                            // Comment has ended
-+                            this.isComment = false;
-+                            latest_offset = index+1;
-+                        }
-+                        if (c == '#' && this.isRightAfterNewline) {
-+                            this.isComment = true;
-+                            if (index != latest_offset) {
-+                                // We got some non-comment data earlier
-+                                super.write(bbuf, latest_offset, index-latest_offset);
-+                            }
-+                        }
-+                        this.isRightAfterNewline = isNewline; // Store for next iteration
-+
-+                    }
-+                    if (latest_offset < off+len && !this.isComment) {
-+                        // We have some unwritten data, that isn't part of a comment
-+                        super.write(bbuf, latest_offset, (off + len) - latest_offset);
-+                    }
-+                }
-+            };
-+            BufferedWriter bufferedwriter = new BufferedWriter(new java.io.OutputStreamWriter(bufferedOutputStream, java.nio.charset.StandardCharsets.UTF_8.newEncoder()));
-+            // Paper end
- 
-             try {
-                 this.properties.store(bufferedwriter, "Minecraft server properties");
--- a/patches/unapplied/server/0650-Add-PlayerSetSpawnEvent.patch
+++ b/patches/unapplied/server/0650-Add-PlayerSetSpawnEvent.patch
@ -1,204 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 19 May 2021 18:59:10 -0700
-Subject: [PATCH] Add PlayerSetSpawnEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/commands/SetSpawnCommand.java b/src/main/java/net/minecraft/server/commands/SetSpawnCommand.java
-index a2d0699e8427b2262a2396495111125eccafbb66..d797637f61bdf8a424f56fbb48e28b7c9117d604 100644
--- a/src/main/java/net/minecraft/server/commands/SetSpawnCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/SetSpawnCommand.java
-@@ -38,24 +38,34 @@ public class SetSpawnCommand {
-         ResourceKey<Level> resourcekey = source.getLevel().dimension();
-         Iterator iterator = targets.iterator();
- 
-+        final Collection<ServerPlayer> actualTargets = new java.util.ArrayList<>(); // Paper
-         while (iterator.hasNext()) {
-             ServerPlayer entityplayer = (ServerPlayer) iterator.next();
- 
-            entityplayer.setRespawnPosition(resourcekey, pos, angle, true, false, org.bukkit.event.player.PlayerSpawnChangeEvent.Cause.COMMAND); // CraftBukkit
-+            // Paper start - PlayerSetSpawnEvent
-+            if (entityplayer.setRespawnPosition(resourcekey, pos, angle, true, false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.COMMAND)) {
-+                actualTargets.add(entityplayer);
-+            }
-+            // Paper end
-         }
-+        // Paper start
-+        if (actualTargets.isEmpty()) {
-+            return 0;
-+        }
-+        // Paper end
- 
-         String s = resourcekey.location().toString();
- 
-        if (targets.size() == 1) {
-+        if (actualTargets.size() == 1) { // Paper
-             source.sendSuccess(() -> {
-                return Component.translatable("commands.spawnpoint.success.single", pos.getX(), pos.getY(), pos.getZ(), angle, s, ((ServerPlayer) targets.iterator().next()).getDisplayName());
-+                return Component.translatable("commands.spawnpoint.success.single", pos.getX(), pos.getY(), pos.getZ(), angle, s, ((ServerPlayer) actualTargets.iterator().next()).getDisplayName()); // Paper
-             }, true);
-         } else {
-             source.sendSuccess(() -> {
-                return Component.translatable("commands.spawnpoint.success.multiple", pos.getX(), pos.getY(), pos.getZ(), angle, s, targets.size());
-+                return Component.translatable("commands.spawnpoint.success.multiple", pos.getX(), pos.getY(), pos.getZ(), angle, s, actualTargets.size()); // Paper
-             }, true);
-         }
- 
-        return targets.size();
-+        return actualTargets.size(); // Paper
-     }
- }
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index eaa1b300870f3bbf5a34cb99e6af116b7c244628..59e02bd5b49e0c900d049a1f1927316d45910768 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1349,7 +1349,7 @@ public class ServerPlayer extends Player {
-             } else if (this.bedBlocked(blockposition, enumdirection)) {
-                 return Either.left(Player.BedSleepingProblem.OBSTRUCTED);
-             } else {
-                this.setRespawnPosition(this.level().dimension(), blockposition, this.getYRot(), false, true, PlayerSpawnChangeEvent.Cause.BED); // CraftBukkit
-+                this.setRespawnPosition(this.level().dimension(), blockposition, this.getYRot(), false, true, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.BED); // Paper - PlayerSetSpawnEvent
-                 if (this.level().isDay()) {
-                     return Either.left(Player.BedSleepingProblem.NOT_POSSIBLE_NOW);
-                 } else {
-@@ -2196,44 +2196,50 @@ public class ServerPlayer extends Player {
-         return this.respawnForced;
-     }
- 
-+    @Deprecated // Paper
-     public void setRespawnPosition(ResourceKey<Level> dimension, @Nullable BlockPos pos, float angle, boolean forced, boolean sendMessage) {
-        // CraftBukkit start
-        this.setRespawnPosition(dimension, pos, angle, forced, sendMessage, PlayerSpawnChangeEvent.Cause.UNKNOWN);
-    }
-
-    public void setRespawnPosition(ResourceKey<Level> resourcekey, @Nullable BlockPos blockposition, float f, boolean flag, boolean flag1, PlayerSpawnChangeEvent.Cause cause) {
-        ServerLevel newWorld = this.server.getLevel(resourcekey);
-        Location newSpawn = (blockposition != null) ? CraftLocation.toBukkit(blockposition, newWorld.getWorld(), f, 0) : null;
-
-        PlayerSpawnChangeEvent event = new PlayerSpawnChangeEvent(this.getBukkitEntity(), newSpawn, flag, cause);
-        Bukkit.getServer().getPluginManager().callEvent(event);
-        if (event.isCancelled()) {
-            return;
-        }
-        newSpawn = event.getNewSpawn();
-        flag = event.isForced();
-
-        if (newSpawn != null) {
-            resourcekey = ((CraftWorld) newSpawn.getWorld()).getHandle().dimension();
-            blockposition = BlockPos.containing(newSpawn.getX(), newSpawn.getY(), newSpawn.getZ());
-            f = newSpawn.getYaw();
-        } else {
-            resourcekey = Level.OVERWORLD;
-            blockposition = null;
-            f = 0.0F;
-+        // Paper start
-+        this.setRespawnPosition(dimension, pos, angle, forced, sendMessage, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.UNKNOWN);
-+    }
-+    @Deprecated
-+    public boolean setRespawnPosition(ResourceKey<Level> dimension, @Nullable BlockPos pos, float angle, boolean forced, boolean sendMessage, PlayerSpawnChangeEvent.Cause cause) {
-+        return this.setRespawnPosition(dimension, pos, angle, forced, sendMessage, cause == PlayerSpawnChangeEvent.Cause.RESET ?
-+            com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLAYER_RESPAWN : com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.valueOf(cause.name()));
-+    }
-+    public boolean setRespawnPosition(ResourceKey<Level> dimension, @Nullable BlockPos pos, float angle, boolean forced, boolean sendMessage, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause cause) {
-+        Location spawnLoc = null;
-+        boolean willNotify = false;
-+        if (pos != null) {
-+            boolean flag2 = pos.equals(this.respawnPosition) && dimension.equals(this.respawnDimension);
-+            spawnLoc = io.papermc.paper.util.MCUtil.toLocation(this.getServer().getLevel(dimension), pos);
-+            spawnLoc.setYaw(angle);
-+            willNotify = sendMessage && !flag2;
-+        }
-+
-+        PlayerSpawnChangeEvent dumbEvent = new PlayerSpawnChangeEvent(this.getBukkitEntity(), spawnLoc, forced,
-+            cause == com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLAYER_RESPAWN ? PlayerSpawnChangeEvent.Cause.RESET : PlayerSpawnChangeEvent.Cause.valueOf(cause.name()));
-+        dumbEvent.callEvent();
-+
-+        com.destroystokyo.paper.event.player.PlayerSetSpawnEvent event = new com.destroystokyo.paper.event.player.PlayerSetSpawnEvent(this.getBukkitEntity(), cause, dumbEvent.getNewSpawn(), dumbEvent.isForced(), willNotify, willNotify ? net.kyori.adventure.text.Component.translatable("block.minecraft.set_spawn") : null);
-+        event.setCancelled(dumbEvent.isCancelled());
-+        if (!event.callEvent()) {
-+            return false;
-         }
-        // CraftBukkit end
-        if (blockposition != null) {
-            boolean flag2 = blockposition.equals(this.respawnPosition) && resourcekey.equals(this.respawnDimension);
-+        if (event.getLocation() != null) {
-+            dimension = event.getLocation().getWorld() != null ? ((CraftWorld) event.getLocation().getWorld()).getHandle().dimension() : dimension;
-+            pos = io.papermc.paper.util.MCUtil.toBlockPosition(event.getLocation());
-+            angle = event.getLocation().getYaw();
-+            forced = event.isForced();
-+            // Paper end
- 
-            if (flag1 && !flag2) {
-                this.sendSystemMessage(Component.translatable("block.minecraft.set_spawn"));
-+            if (event.willNotifyPlayer() && event.getNotification() != null) { // Paper
-+                this.sendSystemMessage(PaperAdventure.asVanilla(event.getNotification())); // Paper
-             }
- 
-            this.respawnPosition = blockposition;
-            this.respawnDimension = resourcekey;
-            this.respawnAngle = f;
-            this.respawnForced = flag;
-+            this.respawnPosition = pos;
-+            this.respawnDimension = dimension;
-+            this.respawnAngle = angle;
-+            this.respawnForced = forced;
-         } else {
-             this.respawnPosition = null;
-             this.respawnDimension = Level.OVERWORLD;
-@@ -2241,6 +2247,7 @@ public class ServerPlayer extends Player {
-             this.respawnForced = false;
-         }
- 
-+        return true; // Paper
-     }
- 
-     public void trackChunk(ChunkPos chunkPos, Packet<?> chunkDataPacket) {
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c8e38ed5e14fb137a7d169c57bc58bdf4421e0cc..c3fb1bbc0e2a44160e86b5bb4ab88f78991fa9e6 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -860,7 +860,7 @@ public abstract class PlayerList {
-                     location = CraftLocation.toBukkit(vec3d, worldserver1.getWorld(), f1, 0.0F);
-                 } else if (blockposition != null) {
-                     entityplayer1.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F));
-                    entityplayer1.setRespawnPosition(null, null, 0f, false, false, PlayerSpawnChangeEvent.Cause.RESET); // CraftBukkit - SPIGOT-5988: Clear respawn location when obstructed
-+                    entityplayer1.setRespawnPosition(null, null, 0f, false, false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLAYER_RESPAWN); // CraftBukkit - SPIGOT-5988: Clear respawn location when obstructed // Paper - PlayerSetSpawnEvent
-                 }
-             }
- 
-diff --git a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-index 1a27b7faa22e6b3dc5fce329ed06425de56c4315..b9903c29bdea8d1e3b6fce0e97be6bd9493cfdf4 100644
--- a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java
-@@ -80,9 +80,14 @@ public class RespawnAnchorBlock extends Block {
-                 ServerPlayer entityplayer = (ServerPlayer) player;
- 
-                 if (entityplayer.getRespawnDimension() != world.dimension() || !pos.equals(entityplayer.getRespawnPosition())) {
-                    entityplayer.setRespawnPosition(world.dimension(), pos, 0.0F, false, true, org.bukkit.event.player.PlayerSpawnChangeEvent.Cause.RESPAWN_ANCHOR); // CraftBukkit
-+                    if (entityplayer.setRespawnPosition(world.dimension(), pos, 0.0F, false, true, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.RESPAWN_ANCHOR)) { // Paper - PlayerSetSpawnEvent
-                     world.playSound((Player) null, (double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, SoundEvents.RESPAWN_ANCHOR_SET_SPAWN, SoundSource.BLOCKS, 1.0F, 1.0F);
-                     return InteractionResult.SUCCESS;
-+                    // Paper start - handle failed set spawn
-+                    } else {
-+                        return InteractionResult.FAIL;
-+                    }
-+                    // Paper end
-                 }
-             }
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 54027efe50942ad1ac3fbe45e9a02b7e7eac0f28..cda8b48a77fc23a674b9e3ef1b60649bcac294f8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1321,9 +1321,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     @Override
-     public void setBedSpawnLocation(Location location, boolean override) {
-         if (location == null) {
-            this.getHandle().setRespawnPosition(null, null, 0.0F, override, false, PlayerSpawnChangeEvent.Cause.PLUGIN);
-+            this.getHandle().setRespawnPosition(null, null, 0.0F, override, false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLUGIN); // Paper - PlayerSetSpawnEvent
-         } else {
-            this.getHandle().setRespawnPosition(((CraftWorld) location.getWorld()).getHandle().dimension(), CraftLocation.toBlockPosition(location), location.getYaw(), override, false, PlayerSpawnChangeEvent.Cause.PLUGIN);
-+            this.getHandle().setRespawnPosition(((CraftWorld) location.getWorld()).getHandle().dimension(), CraftLocation.toBlockPosition(location), location.getYaw(), override, false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.PLUGIN); // Paper - PlayerSetSpawnEvent
-         }
-     }
- 
--- a/patches/unapplied/server/0651-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/unapplied/server/0651-Make-hoppers-respect-inventory-max-stack-size.patch
@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Wed, 7 Jul 2021 16:30:17 -0700
-Subject: [PATCH] Make hoppers respect inventory max stack size
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 73e505630e8a702e0c46e042c478a9c9c246856c..6907e647ef4d3f5c9c46edb4cf0905844dd1cea9 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-@@ -436,15 +436,17 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
- 
-             if (itemstack1.isEmpty()) {
-                 // Spigot start - SPIGOT-6693, InventorySubcontainer#setItem
-+                ItemStack leftover = ItemStack.EMPTY; // Paper
-                 if (!stack.isEmpty() && stack.getCount() > to.getMaxStackSize()) {
-+                    leftover = stack; // Paper
-                     stack = stack.split(to.getMaxStackSize());
-                 }
-                 // Spigot end
-                 to.setItem(slot, stack);
-                stack = ItemStack.EMPTY;
-+                stack = leftover; // Paper
-                 flag = true;
-             } else if (HopperBlockEntity.canMergeItems(itemstack1, stack)) {
-                int j = stack.getMaxStackSize() - itemstack1.getCount();
-+                int j = Math.min(stack.getMaxStackSize(), to.getMaxStackSize()) - itemstack1.getCount(); // Paper
-                 int k = Math.min(stack.getCount(), j);
- 
-                 stack.shrink(k);
--- a/patches/unapplied/server/0652-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/unapplied/server/0652-Optimize-entity-tracker-passenger-checks.patch
@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Andrew Steinborn <git@steinborn.me>
-Date: Sun, 8 Aug 2021 00:52:54 -0400
-Subject: [PATCH] Optimize entity tracker passenger checks
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index d1bcc1f9816826391b7ba7c79e3b1c2c013933de..12820b5f8a3da042f04787b36cc6b6c7d15f803f 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
-+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -76,7 +76,7 @@ public class ServerEntity {
-         this.trackedPlayers = trackedPlayers;
-         // CraftBukkit end
-         this.ap = Vec3.ZERO;
-        this.lastPassengers = Collections.emptyList();
-+        this.lastPassengers = com.google.common.collect.ImmutableList.of(); // Paper - optimize passenger checks
-         this.level = worldserver;
-         this.broadcast = consumer;
-         this.entity = entity;
--- a/patches/unapplied/server/0653-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/unapplied/server/0653-Config-option-for-Piglins-guarding-chests.patch
@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Wed, 2 Dec 2020 03:07:58 -0800
-Subject: [PATCH] Config option for Piglins guarding chests
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-index 092cdb889564903102dccfe7bf2e320a1eba5efe..c8e6893a7d2be08d6b0d111aa6e58e72f3376edc 100644
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-@@ -477,6 +477,7 @@ public class PiglinAi {
-     }
- 
-     public static void angerNearbyPiglins(Player player, boolean blockOpen) {
-+        if (!player.level().paperConfig().entities.behavior.piglinsGuardChests) return; // Paper
-         List<Piglin> list = player.level().getEntitiesOfClass(Piglin.class, player.getBoundingBox().inflate(16.0D));
- 
-         list.stream().filter(PiglinAi::isIdle).filter((entitypiglin) -> {
--- a/patches/unapplied/server/0654-Added-EntityDamageItemEvent.patch
+++ b/patches/unapplied/server/0654-Added-EntityDamageItemEvent.patch
@ -1,65 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Tue, 22 Dec 2020 13:52:48 -0800
-Subject: [PATCH] Added EntityDamageItemEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 34e54233d54f21cf4304c39e53aa6a7fb06a67cf..afbf619feb35751046131e7b22791e789d16427f 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
-+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -596,7 +596,7 @@ public final class ItemStack {
-         return this.getItem().getMaxDamage();
-     }
- 
-    public boolean hurt(int amount, RandomSource random, @Nullable ServerPlayer player) {
-+    public boolean hurt(int amount, RandomSource random, @Nullable LivingEntity player) { // Paper - allow any living entity instead of only ServerPlayers
-         if (!this.isDamageableItem()) {
-             return false;
-         } else {
-@@ -614,8 +614,8 @@ public final class ItemStack {
- 
-                 amount -= k;
-                 // CraftBukkit start
-                if (player != null) {
-                    PlayerItemDamageEvent event = new PlayerItemDamageEvent(player.getBukkitEntity(), CraftItemStack.asCraftMirror(this), amount);
-+                if (player instanceof ServerPlayer serverPlayer) { // Paper
-+                    PlayerItemDamageEvent event = new PlayerItemDamageEvent(serverPlayer.getBukkitEntity(), CraftItemStack.asCraftMirror(this), amount); // Paper
-                     event.getPlayer().getServer().getPluginManager().callEvent(event);
- 
-                     if (amount != event.getDamage() || event.isCancelled()) {
-@@ -626,6 +626,14 @@ public final class ItemStack {
-                     }
- 
-                     amount = event.getDamage();
-+                    // Paper start - EntityDamageItemEvent
-+                } else if (player != null) {
-+                    io.papermc.paper.event.entity.EntityDamageItemEvent event = new io.papermc.paper.event.entity.EntityDamageItemEvent(player.getBukkitLivingEntity(), CraftItemStack.asCraftMirror(this), amount);
-+                    if (!event.callEvent()) {
-+                        return false;
-+                    }
-+                    amount = event.getDamage();
-+                    // Paper end
-                 }
-                 // CraftBukkit end
-                 if (amount <= 0) {
-@@ -633,8 +641,8 @@ public final class ItemStack {
-                 }
-             }
- 
-            if (player != null && amount != 0) {
-                CriteriaTriggers.ITEM_DURABILITY_CHANGED.trigger(player, this, this.getDamageValue() + amount);
-+            if (player instanceof ServerPlayer serverPlayer && amount != 0) { // Paper
-+                CriteriaTriggers.ITEM_DURABILITY_CHANGED.trigger(serverPlayer, this, this.getDamageValue() + amount); // Paper
-             }
- 
-             j = this.getDamageValue() + amount;
-@@ -646,7 +654,7 @@ public final class ItemStack {
-     public <T extends LivingEntity> void hurtAndBreak(int amount, T entity, Consumer<T> breakCallback) {
-         if (!entity.level().isClientSide && (!(entity instanceof net.minecraft.world.entity.player.Player) || !((net.minecraft.world.entity.player.Player) entity).getAbilities().instabuild)) {
-             if (this.isDamageableItem()) {
-                if (this.hurt(amount, entity.getRandom(), entity instanceof ServerPlayer ? (ServerPlayer) entity : null)) {
-+                if (this.hurt(amount, entity.getRandom(), entity /*instanceof ServerPlayer ? (ServerPlayer) entity : null*/)) { // Paper - pass LivingEntity for EntityItemDamageEvent
-                     breakCallback.accept(entity);
-                     Item item = this.getItem();
-                     // CraftBukkit start - Check for item breaking
--- a/patches/unapplied/server/0655-Optimize-indirect-passenger-iteration.patch
+++ b/patches/unapplied/server/0655-Optimize-indirect-passenger-iteration.patch
@ -1,53 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Andrew Steinborn <git@steinborn.me>
-Date: Mon, 9 Aug 2021 00:38:37 -0400
-Subject: [PATCH] Optimize indirect passenger iteration
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e3024f2fff1cd8de618216a42716da8caf37d5be..7802d3d9274c9083a89b9f62441194e8a0d8975b 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3882,20 +3882,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     }
- 
-     private Stream<Entity> getIndirectPassengersStream() {
-+        if (this.passengers.isEmpty()) { return Stream.of(); } // Paper
-         return this.passengers.stream().flatMap(Entity::getSelfAndPassengers);
-     }
- 
-     @Override
-     public Stream<Entity> getSelfAndPassengers() {
-+        if (this.passengers.isEmpty()) { return Stream.of(this); } // Paper
-         return Stream.concat(Stream.of(this), this.getIndirectPassengersStream());
-     }
- 
-     @Override
-     public Stream<Entity> getPassengersAndSelf() {
-+        if (this.passengers.isEmpty()) { return Stream.of(this); } // Paper
-         return Stream.concat(this.passengers.stream().flatMap(Entity::getPassengersAndSelf), Stream.of(this));
-     }
- 
-     public Iterable<Entity> getIndirectPassengers() {
-+        // Paper start - rewrite this method
-+        if (this.passengers.isEmpty()) { return ImmutableList.of(); }
-+        ImmutableList.Builder<Entity> indirectPassengers = ImmutableList.builder();
-+        for (Entity passenger : this.passengers) {
-+            indirectPassengers.add(passenger);
-+            indirectPassengers.addAll(passenger.getIndirectPassengers());
-+        }
-+        return indirectPassengers.build();
-+    }
-+    private Iterable<Entity> getIndirectPassengers_old() {
-+        // Paper end
-         return () -> {
-             return this.getIndirectPassengersStream().iterator();
-         };
-@@ -3912,6 +3926,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     // Paper end - rewrite chunk system
- 
-     public boolean hasExactlyOnePlayerPassenger() {
-+        if (this.passengers.isEmpty()) { return false; } // Paper
-         return this.getIndirectPassengersStream().filter((entity) -> {
-             return entity instanceof Player;
-         }).count() == 1L;
--- a/patches/unapplied/server/0656-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/unapplied/server/0656-Configurable-item-frame-map-cursor-update-interval.patch
@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Warrior <50800980+Warriorrrr@users.noreply.github.com>
-Date: Fri, 13 Aug 2021 01:14:38 +0200
-Subject: [PATCH] Configurable item frame map cursor update interval
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 12820b5f8a3da042f04787b36cc6b6c7d15f803f..f8b3d633e788c3d6cb5b53e606fa798a42582460 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
-+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -114,7 +114,7 @@ public class ServerEntity {
-             if (true || this.tickCount % 10 == 0) { // CraftBukkit - Moved below, should always enter this block
-                 ItemStack itemstack = entityitemframe.getItem();
- 
-                if (this.tickCount % 10 == 0 && itemstack.getItem() instanceof MapItem) { // CraftBukkit - Moved this.tickCounter % 10 logic here so item frames do not enter the other blocks
-+                if (this.level.paperConfig().maps.itemFrameCursorUpdateInterval > 0 && this.tickCount % this.level.paperConfig().maps.itemFrameCursorUpdateInterval == 0 && itemstack.getItem() instanceof MapItem) { // CraftBukkit - Moved this.tickCounter % 10 logic here so item frames do not enter the other blocks // Paper - Make item frame map cursor update interval configurable
-                     Integer integer = MapItem.getMapId(itemstack);
-                     MapItemSavedData worldmap = MapItem.getSavedData(integer, this.level);
- 
--- a/patches/unapplied/server/0657-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/unapplied/server/0657-Make-EntityUnleashEvent-cancellable.patch
@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 3 Jan 2021 21:25:31 -0800
-Subject: [PATCH] Make EntityUnleashEvent cancellable
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 5b134bd0cc4c2ba20eaf275c190c139d987d9bcb..90d95dc95fe8868a4c0298acb0e1c6ce7bd883cb 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1543,7 +1543,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
-         if (flag1 && this.isLeashed()) {
-             // Paper start - drop leash variable
-             EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.UNKNOWN, true);
-            this.level().getCraftServer().getPluginManager().callEvent(event); // CraftBukkit
-+            if (!event.callEvent()) { return flag1; }
-             this.dropLeash(true, event.isDropLeash());
-             // Paper end
-         }
-diff --git a/src/main/java/net/minecraft/world/entity/PathfinderMob.java b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
-index a4dfe40d30a5abf5d614d0921b3b23023fdbc4b1..610bc67af915c8ff40a6c8a0d8e022e7db8614d8 100644
--- a/src/main/java/net/minecraft/world/entity/PathfinderMob.java
-+++ b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
-@@ -51,7 +51,7 @@ public abstract class PathfinderMob extends Mob {
-                 if (f > entity.level().paperConfig().misc.maxLeashDistance) { // Paper
-                     // Paper start - drop leash variable
-                     EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE, true);
-                    this.level().getCraftServer().getPluginManager().callEvent(event); // CraftBukkit
-+                    if (!event.callEvent()) { return; }
-                     this.dropLeash(true, event.isDropLeash());
-                     // Paper end
-                 }
-@@ -63,7 +63,7 @@ public abstract class PathfinderMob extends Mob {
-             if (f > entity.level().paperConfig().misc.maxLeashDistance) { // Paper
-                 // Paper start - drop leash variable
-                 EntityUnleashEvent event = new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE, true);
-                this.level().getCraftServer().getPluginManager().callEvent(event); // CraftBukkit
-+                if (!event.callEvent()) { return; }
-                 this.dropLeash(true, event.isDropLeash());
-                 // Paper end
-                 this.goalSelector.disableControlFlag(Goal.Flag.MOVE);
--- a/patches/unapplied/server/0658-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/unapplied/server/0658-Clear-bucket-NBT-after-dispense.patch
@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Fri, 13 Aug 2021 15:00:06 -0700
-Subject: [PATCH] Clear bucket NBT after dispense
-
-
-diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-index cec6ee5d31f2a86a61fd142035af853fa512e211..f651d866355557d10d4bb8730e0aceac483d3ba7 100644
--- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-+++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-@@ -650,8 +650,7 @@ public interface DispenseItemBehavior {
-                     Item item = Items.BUCKET;
-                     stack.shrink(1);
-                     if (stack.isEmpty()) {
-                        stack.setItem(Items.BUCKET);
-                        stack.setCount(1);
-+                        stack = new ItemStack(item); // Paper - clear tag
-                     } else if (((DispenserBlockEntity) pointer.getEntity()).addItem(new ItemStack(item)) < 0) {
-                         this.defaultDispenseItemBehavior.dispense(pointer, new ItemStack(item));
-                     }
--- a/patches/unapplied/server/0659-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/unapplied/server/0659-Change-EnderEye-target-without-changing-other-things.patch
@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sat, 21 Aug 2021 12:13:53 -0700
-Subject: [PATCH] Change EnderEye target without changing other things
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/EyeOfEnder.java b/src/main/java/net/minecraft/world/entity/projectile/EyeOfEnder.java
-index ee6bbe96503e9205349e9a5c411dc60dd952ec9e..e48706e2fefc39fcce3c65f629153fdcd677044c 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/EyeOfEnder.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/EyeOfEnder.java
-@@ -70,6 +70,11 @@ public class EyeOfEnder extends Entity implements ItemSupplier {
-     }
- 
-     public void signalTo(BlockPos pos) {
-+        // Paper start
-+        this.signalTo(pos, true);
-+    }
-+    public void signalTo(BlockPos pos, boolean update) {
-+        // Paper end
-         double d0 = (double) pos.getX();
-         int i = pos.getY();
-         double d1 = (double) pos.getZ();
-@@ -87,8 +92,10 @@ public class EyeOfEnder extends Entity implements ItemSupplier {
-             this.tz = d1;
-         }
- 
-+        if (update) { // Paper
-         this.life = 0;
-         this.surviveAfterDeath = this.random.nextInt(5) > 0;
-+        } // Paper
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java
-index c0c917b928a648206ff6fd53f13fbe3bcb0cdda7..18712bfd46d3852bc1210c8f0dea7e9af3e55b4d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java
-@@ -32,8 +32,15 @@ public class CraftEnderSignal extends CraftEntity implements EnderSignal {
- 
-     @Override
-     public void setTargetLocation(Location location) {
-+        // Paper start
-+        this.setTargetLocation(location, true);
-+    }
-+
-+    @Override
-+    public void setTargetLocation(Location location, boolean update) {
-+        // Paper end
-         Preconditions.checkArgument(getWorld().equals(location.getWorld()), "Cannot target EnderSignal across worlds");
-        this.getHandle().signalTo(CraftLocation.toBlockPosition(location));
-+        this.getHandle().signalTo(CraftLocation.toBlockPosition(location), update); // Paper
-     }
- 
-     @Override
--- a/patches/unapplied/server/0660-Add-BlockBreakBlockEvent.patch
+++ b/patches/unapplied/server/0660-Add-BlockBreakBlockEvent.patch
@ -1,86 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 3 Jan 2021 17:58:11 -0800
-Subject: [PATCH] Add BlockBreakBlockEvent
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index 36b196c8834c4eb873bfca0b12f1fc2b421ea071..9522e646529f3d849471931b4b3c0d133e7fcfc5 100644
--- a/src/main/java/net/minecraft/world/level/block/Block.java
-+++ b/src/main/java/net/minecraft/world/level/block/Block.java
-@@ -319,6 +319,23 @@ public class Block extends BlockBehaviour implements ItemLike {
-         }
- 
-     }
-+    // Paper start
-+    public static boolean dropResources(BlockState state, LevelAccessor world, BlockPos pos, @Nullable BlockEntity blockEntity, BlockPos source) {
-+        if (world instanceof ServerLevel) {
-+            List<org.bukkit.inventory.ItemStack> items = com.google.common.collect.Lists.newArrayList();
-+            for (net.minecraft.world.item.ItemStack drop : net.minecraft.world.level.block.Block.getDrops(state, world.getMinecraftWorld(), pos, blockEntity)) {
-+                items.add(org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(drop));
-+            }
-+            io.papermc.paper.event.block.BlockBreakBlockEvent event = new io.papermc.paper.event.block.BlockBreakBlockEvent(org.bukkit.craftbukkit.block.CraftBlock.at(world, pos), org.bukkit.craftbukkit.block.CraftBlock.at(world, source), items);
-+            event.callEvent();
-+            for (var drop : event.getDrops()) {
-+                popResource(world.getMinecraftWorld(), pos, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(drop));
-+            }
-+            state.spawnAfterBreak(world.getMinecraftWorld(), pos, ItemStack.EMPTY, true);
-+        }
-+        return true;
-+    }
-+    // Paper end
- 
-     public static void dropResources(BlockState state, Level world, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack tool) {
-         if (world instanceof ServerLevel) {
-diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index e14967a745c21ff48a88fa0f22cc296a73b43d92..8125c334c54d41ad731bbc3481662b0cf0afee51 100644
--- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-@@ -401,7 +401,7 @@ public class PistonBaseBlock extends DirectionalBlock {
-                 iblockdata1 = world.getBlockState(blockposition3);
-                 BlockEntity tileentity = iblockdata1.hasBlockEntity() ? world.getBlockEntity(blockposition3) : null;
- 
-                dropResources(iblockdata1, world, blockposition3, tileentity);
-+                dropResources(iblockdata1, world, blockposition3, tileentity, pos); // Paper
-                 world.setBlock(blockposition3, Blocks.AIR.defaultBlockState(), 18);
-                 world.gameEvent(GameEvent.BLOCK_DESTROY, blockposition3, GameEvent.Context.of(iblockdata1));
-                 if (!iblockdata1.is(BlockTags.FIRE)) {
-diff --git a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
-index c694b16be7c276fbf34aed2fd2aa6d6b79625561..5502ad143fd2575f1346334b5b4fe7846628f54e 100644
--- a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
-+++ b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
-@@ -295,7 +295,7 @@ public abstract class FlowingFluid extends Fluid {
-             ((LiquidBlockContainer) state.getBlock()).placeLiquid(world, pos, state, fluidState);
-         } else {
-             if (!state.isAir()) {
-                this.beforeDestroyingBlock(world, pos, state);
-+                this.beforeDestroyingBlock(world, pos, state, pos.relative(direction.getOpposite())); // Paper
-             }
- 
-             world.setBlock(pos, fluidState.createLegacyBlock(), 3);
-@@ -303,6 +303,7 @@ public abstract class FlowingFluid extends Fluid {
- 
-     }
- 
-+    protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state, BlockPos source) { beforeDestroyingBlock(world, pos, state); } // Paper - add source parameter
-     protected abstract void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state);
- 
-     private static short getCacheKey(BlockPos from, BlockPos to) {
-diff --git a/src/main/java/net/minecraft/world/level/material/WaterFluid.java b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
-index 1897c0012800d5ba9d2fc386f3e2bf57c9d878bb..82e85fbbd45244d02df90fa00c9046e7f51275a2 100644
--- a/src/main/java/net/minecraft/world/level/material/WaterFluid.java
-+++ b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
-@@ -64,6 +64,13 @@ public abstract class WaterFluid extends FlowingFluid {
-         return world.getGameRules().getBoolean(GameRules.RULE_WATER_SOURCE_CONVERSION);
-     }
- 
-+    // Paper start
-+    @Override
-+    protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state,  BlockPos source) {
-+        BlockEntity tileentity = state.hasBlockEntity() ? world.getBlockEntity(pos) : null;
-+        Block.dropResources(state, world, pos, tileentity, source);
-+    }
-+    // Paper end
-     @Override
-     protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state) {
-         BlockEntity blockEntity = state.hasBlockEntity() ? world.getBlockEntity(pos) : null;
--- a/patches/unapplied/server/0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/unapplied/server/0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
@ -1,147 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sun, 26 Sep 2021 12:57:28 -0700
-Subject: [PATCH] Option to prevent NBT copy in smithing recipes
-
-
-diff --git a/src/main/java/net/minecraft/world/item/crafting/SmithingTransformRecipe.java b/src/main/java/net/minecraft/world/item/crafting/SmithingTransformRecipe.java
-index 2b3718f9fc68c286e8abdde4a960e19b97302531..7819a914bbbe4f0e2a4407e4c99b14732d4d89c5 100644
--- a/src/main/java/net/minecraft/world/item/crafting/SmithingTransformRecipe.java
-+++ b/src/main/java/net/minecraft/world/item/crafting/SmithingTransformRecipe.java
-@@ -25,8 +25,15 @@ public class SmithingTransformRecipe implements SmithingRecipe {
-     final Ingredient base;
-     final Ingredient addition;
-     final ItemStack result;
-+    final boolean copyNBT; // Paper
- 
-     public SmithingTransformRecipe(ResourceLocation id, Ingredient template, Ingredient base, Ingredient addition, ItemStack result) {
-+        // Paper start
-+        this(id, template, base, addition, result, true);
-+    }
-+    public SmithingTransformRecipe(ResourceLocation id, Ingredient template, Ingredient base, Ingredient addition, ItemStack result, boolean copyNBT) {
-+        this.copyNBT = copyNBT;
-+        // Paper end
-         this.id = id;
-         this.template = template;
-         this.base = base;
-@@ -42,11 +49,13 @@ public class SmithingTransformRecipe implements SmithingRecipe {
-     @Override
-     public ItemStack assemble(Container inventory, RegistryAccess registryManager) {
-         ItemStack itemstack = this.result.copy();
-+        if (this.copyNBT) { // Paper - copy nbt conditionally
-         CompoundTag nbttagcompound = inventory.getItem(1).getTag();
- 
-         if (nbttagcompound != null) {
-             itemstack.setTag(nbttagcompound.copy());
-         }
-+        } // Paper
- 
-         return itemstack;
-     }
-@@ -91,7 +100,7 @@ public class SmithingTransformRecipe implements SmithingRecipe {
-     public Recipe toBukkitRecipe() {
-         CraftItemStack result = CraftItemStack.asCraftMirror(this.result);
- 
-        CraftSmithingTransformRecipe recipe = new CraftSmithingTransformRecipe(CraftNamespacedKey.fromMinecraft(this.id), result, CraftRecipe.toBukkit(this.template), CraftRecipe.toBukkit(this.base), CraftRecipe.toBukkit(this.addition));
-+        CraftSmithingTransformRecipe recipe = new CraftSmithingTransformRecipe(CraftNamespacedKey.fromMinecraft(this.id), result, CraftRecipe.toBukkit(this.template), CraftRecipe.toBukkit(this.base), CraftRecipe.toBukkit(this.addition), this.copyNBT); // Paper
- 
-         return recipe;
-     }
-diff --git a/src/main/java/net/minecraft/world/item/crafting/SmithingTrimRecipe.java b/src/main/java/net/minecraft/world/item/crafting/SmithingTrimRecipe.java
-index c28b0d7a97e8463f7fe15bbf0f3485f2559efd4a..5b0cee067b5c69d2d4c51b8c8d2489744b843043 100644
--- a/src/main/java/net/minecraft/world/item/crafting/SmithingTrimRecipe.java
-+++ b/src/main/java/net/minecraft/world/item/crafting/SmithingTrimRecipe.java
-@@ -31,8 +31,15 @@ public class SmithingTrimRecipe implements SmithingRecipe {
-     final Ingredient template;
-     final Ingredient base;
-     final Ingredient addition;
-+    final boolean copyNbt; // Paper
- 
-     public SmithingTrimRecipe(ResourceLocation id, Ingredient template, Ingredient base, Ingredient addition) {
-+        // Paper start
-+        this(id, template, base, addition, true);
-+    }
-+    public SmithingTrimRecipe(ResourceLocation id, Ingredient template, Ingredient base, Ingredient addition, boolean copyNbt) {
-+        this.copyNbt = copyNbt;
-+        // Paper end
-         this.id = id;
-         this.template = template;
-         this.base = base;
-@@ -59,7 +66,7 @@ public class SmithingTrimRecipe implements SmithingRecipe {
-                     return ItemStack.EMPTY;
-                 }
- 
-                ItemStack itemstack1 = itemstack.copy();
-+                ItemStack itemstack1 = this.copyNbt ? itemstack.copy() : new ItemStack(itemstack.getItem(), itemstack.getCount()); // Paper
- 
-                 itemstack1.setCount(1);
-                 ArmorTrim armortrim = new ArmorTrim((Holder) optional.get(), (Holder) optional1.get());
-@@ -124,7 +131,7 @@ public class SmithingTrimRecipe implements SmithingRecipe {
-     // CraftBukkit start
-     @Override
-     public Recipe toBukkitRecipe() {
-        return new CraftSmithingTrimRecipe(CraftNamespacedKey.fromMinecraft(this.id), CraftRecipe.toBukkit(this.template), CraftRecipe.toBukkit(this.base), CraftRecipe.toBukkit(this.addition));
-+        return new CraftSmithingTrimRecipe(CraftNamespacedKey.fromMinecraft(this.id), CraftRecipe.toBukkit(this.template), CraftRecipe.toBukkit(this.base), CraftRecipe.toBukkit(this.addition), this.copyNbt); // Paper
-     }
-     // CraftBukkit end
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSmithingTransformRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSmithingTransformRecipe.java
-index 872baa62d5c893141af88727f5f93911cebf8cdc..248d742b173d7b5fae655e656cd87146e2a483c1 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSmithingTransformRecipe.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSmithingTransformRecipe.java
-@@ -11,12 +11,17 @@ public class CraftSmithingTransformRecipe extends SmithingTransformRecipe implem
-     public CraftSmithingTransformRecipe(NamespacedKey key, ItemStack result, RecipeChoice template, RecipeChoice base, RecipeChoice addition) {
-         super(key, result, template, base, addition);
-     }
-+    // Paper start
-+    public CraftSmithingTransformRecipe(NamespacedKey key, ItemStack result, RecipeChoice template, RecipeChoice base, RecipeChoice addition, boolean copyNbt) {
-+        super(key, result, template, base, addition, copyNbt);
-+    }
-+    // Paper end
- 
-     public static CraftSmithingTransformRecipe fromBukkitRecipe(SmithingTransformRecipe recipe) {
-         if (recipe instanceof CraftSmithingTransformRecipe) {
-             return (CraftSmithingTransformRecipe) recipe;
-         }
-        CraftSmithingTransformRecipe ret = new CraftSmithingTransformRecipe(recipe.getKey(), recipe.getResult(), recipe.getTemplate(), recipe.getBase(), recipe.getAddition());
-+        CraftSmithingTransformRecipe ret = new CraftSmithingTransformRecipe(recipe.getKey(), recipe.getResult(), recipe.getTemplate(), recipe.getBase(), recipe.getAddition(), recipe.willCopyNbt()); // Paper
-         return ret;
-     }
- 
-@@ -24,6 +29,6 @@ public class CraftSmithingTransformRecipe extends SmithingTransformRecipe implem
-     public void addToCraftingManager() {
-         ItemStack result = this.getResult();
- 
-        MinecraftServer.getServer().getRecipeManager().addRecipe(new net.minecraft.world.item.crafting.SmithingTransformRecipe(CraftNamespacedKey.toMinecraft(this.getKey()), toNMS(this.getTemplate(), true), toNMS(this.getBase(), true), toNMS(this.getAddition(), true), CraftItemStack.asNMSCopy(result)));
-+        MinecraftServer.getServer().getRecipeManager().addRecipe(new net.minecraft.world.item.crafting.SmithingTransformRecipe(CraftNamespacedKey.toMinecraft(this.getKey()), toNMS(this.getTemplate(), true), toNMS(this.getBase(), true), toNMS(this.getAddition(), true), CraftItemStack.asNMSCopy(result), this.willCopyNbt())); // Paper
-     }
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSmithingTrimRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSmithingTrimRecipe.java
-index 6ef43f58d8fb6bbe9e2a58fc0bb62fb0c935d7f9..610e6fa88e5d835027ba19d1bd3ff31cc42d2687 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSmithingTrimRecipe.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSmithingTrimRecipe.java
-@@ -11,17 +11,22 @@ public class CraftSmithingTrimRecipe extends SmithingTrimRecipe implements Craft
-     public CraftSmithingTrimRecipe(NamespacedKey key, RecipeChoice template, RecipeChoice base, RecipeChoice addition) {
-         super(key, template, base, addition);
-     }
-+    // Paper start
-+    public CraftSmithingTrimRecipe(NamespacedKey key, RecipeChoice template, RecipeChoice base, RecipeChoice addition, boolean copyNbt) {
-+        super(key, template, base, addition, copyNbt);
-+    }
-+    // Paper end
- 
-     public static CraftSmithingTrimRecipe fromBukkitRecipe(SmithingTrimRecipe recipe) {
-         if (recipe instanceof CraftSmithingTrimRecipe) {
-             return (CraftSmithingTrimRecipe) recipe;
-         }
-        CraftSmithingTrimRecipe ret = new CraftSmithingTrimRecipe(recipe.getKey(), recipe.getTemplate(), recipe.getBase(), recipe.getAddition());
-+        CraftSmithingTrimRecipe ret = new CraftSmithingTrimRecipe(recipe.getKey(), recipe.getTemplate(), recipe.getBase(), recipe.getAddition(), recipe.willCopyNbt()); // Paper
-         return ret;
-     }
- 
-     @Override
-     public void addToCraftingManager() {
-        MinecraftServer.getServer().getRecipeManager().addRecipe(new net.minecraft.world.item.crafting.SmithingTrimRecipe(CraftNamespacedKey.toMinecraft(this.getKey()), toNMS(this.getTemplate(), true), toNMS(this.getBase(), true), toNMS(this.getAddition(), true)));
-+        MinecraftServer.getServer().getRecipeManager().addRecipe(new net.minecraft.world.item.crafting.SmithingTrimRecipe(CraftNamespacedKey.toMinecraft(this.getKey()), toNMS(this.getTemplate(), true), toNMS(this.getBase(), true), toNMS(this.getAddition(), true), this.willCopyNbt())); // Paper
-     }
- }
--- a/patches/unapplied/server/0662-More-CommandBlock-API.patch
+++ b/patches/unapplied/server/0662-More-CommandBlock-API.patch
@ -1,100 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Thu, 23 Sep 2021 10:40:09 -0700
-Subject: [PATCH] More CommandBlock API
-
-
-diff --git a/src/main/java/io/papermc/paper/commands/PaperCommandBlockHolder.java b/src/main/java/io/papermc/paper/commands/PaperCommandBlockHolder.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0b42306f17bf8850a13a51067c2d19e7583187e5
--- /dev/null
-+++ b/src/main/java/io/papermc/paper/commands/PaperCommandBlockHolder.java
-@@ -0,0 +1,33 @@
-+package io.papermc.paper.commands;
-+
-+import io.papermc.paper.adventure.PaperAdventure;
-+import io.papermc.paper.command.CommandBlockHolder;
-+import net.kyori.adventure.text.Component;
-+import net.minecraft.world.level.BaseCommandBlock;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+public interface PaperCommandBlockHolder extends CommandBlockHolder {
-+
-+    BaseCommandBlock getCommandBlockHandle();
-+
-+    @Override
-+    default @NotNull Component lastOutput() {
-+        return PaperAdventure.asAdventure(getCommandBlockHandle().getLastOutput());
-+    }
-+
-+    @Override
-+    default void lastOutput(@Nullable Component lastOutput) {
-+        getCommandBlockHandle().setLastOutput(PaperAdventure.asVanilla(lastOutput));
-+    }
-+
-+    @Override
-+    default int getSuccessCount() {
-+        return getCommandBlockHandle().getSuccessCount();
-+    }
-+
-+    @Override
-+    default void setSuccessCount(int successCount) {
-+        getCommandBlockHandle().setSuccessCount(successCount);
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java
-index c4ea6760f489e6171f9e6e170160b932597f842f..245a9b062a0033a39fd42f3ff94350192570aec4 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCommandBlock.java
-@@ -5,7 +5,7 @@ import org.bukkit.World;
- import org.bukkit.block.CommandBlock;
- import org.bukkit.craftbukkit.util.CraftChatMessage;
- 
-public class CraftCommandBlock extends CraftBlockEntityState<CommandBlockEntity> implements CommandBlock {
-+public class CraftCommandBlock extends CraftBlockEntityState<CommandBlockEntity> implements CommandBlock, io.papermc.paper.commands.PaperCommandBlockHolder {
- 
-     public CraftCommandBlock(World world, CommandBlockEntity tileEntity) {
-         super(world, tileEntity);
-@@ -41,5 +41,10 @@ public class CraftCommandBlock extends CraftBlockEntityState<CommandBlockEntity>
-     public void name(net.kyori.adventure.text.Component name) {
-         getSnapshot().getCommandBlock().setName(name == null ? net.minecraft.network.chat.Component.literal("@") : io.papermc.paper.adventure.PaperAdventure.asVanilla(name));
-     }
-+
-+    @Override
-+    public net.minecraft.world.level.BaseCommandBlock getCommandBlockHandle() {
-+        return getSnapshot().getCommandBlock();
-+    }
-     // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java
-index 66fb6aeb49b7e93d2a4d9b5ce7f1a7d68f571cf5..2534abcdce426189ac15e0659ab62840b3d54762 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartCommand.java
-@@ -13,7 +13,7 @@ import org.bukkit.permissions.PermissionAttachment;
- import org.bukkit.permissions.PermissionAttachmentInfo;
- import org.bukkit.plugin.Plugin;
- 
-public class CraftMinecartCommand extends CraftMinecart implements CommandMinecart {
-+public class CraftMinecartCommand extends CraftMinecart implements CommandMinecart, io.papermc.paper.commands.PaperCommandBlockHolder {
-     private final PermissibleBase perm = new PermissibleBase(this);
- 
-     public CraftMinecartCommand(CraftServer server, MinecartCommandBlock entity) {
-@@ -64,6 +64,17 @@ public class CraftMinecartCommand extends CraftMinecart implements CommandMineca
-     public net.kyori.adventure.text.@org.jetbrains.annotations.NotNull Component name() {
-         return io.papermc.paper.adventure.PaperAdventure.asAdventure(this.getHandle().getCommandBlock().getName());
-     }
-+
-+    @Override
-+    public net.minecraft.world.level.BaseCommandBlock getCommandBlockHandle() {
-+        return getHandle().getCommandBlock();
-+    }
-+
-+    @Override
-+    public void lastOutput(net.kyori.adventure.text.Component lastOutput) {
-+        io.papermc.paper.commands.PaperCommandBlockHolder.super.lastOutput(lastOutput);
-+        getCommandBlockHandle().onUpdated();
-+    }
-     // Paper end
- 
-     @Override