diff --git a/patches/unapplied/server/Per-world-ticks-per-spawn-settings.patch b/patches/server/Per-world-ticks-per-spawn-settings.patch
similarity index 100%
rename from patches/unapplied/server/Per-world-ticks-per-spawn-settings.patch
rename to patches/server/Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/unapplied/server/Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/Properly-track-the-changed-item-from-dispense-events.patch
similarity index 97%
rename from patches/unapplied/server/Properly-track-the-changed-item-from-dispense-events.patch
rename to patches/server/Properly-track-the-changed-item-from-dispense-events.patch
index 95758b0e4..4f26a70e3 100644
--- a/patches/unapplied/server/Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/server/Properly-track-the-changed-item-from-dispense-events.patch
@@ -59,9 +59,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  if (dispensiblecontaineritem.emptyContents((Player) null, worldserver, blockposition, (BlockHitResult) null)) {
 -                    dispensiblecontaineritem.checkExtraContent((Player) null, worldserver, stack, blockposition);
 +                    dispensiblecontaineritem.checkExtraContent((Player) null, worldserver, dispensedItem, blockposition); // Paper - track changed item from dispense event
-                     // CraftBukkit start - Handle stacked buckets
-                     Item item = Items.BUCKET;
-                     stack.shrink(1);
+                     return this.consumeWithRemainder(pointer, stack, new ItemStack(Items.BUCKET));
+                 } else {
+                     return this.defaultDispenseItemBehavior.dispense(pointer, stack);
 diff --git a/src/main/java/net/minecraft/core/dispenser/ProjectileDispenseBehavior.java b/src/main/java/net/minecraft/core/dispenser/ProjectileDispenseBehavior.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/core/dispenser/ProjectileDispenseBehavior.java