From 8a6e31ec594c88f78adb91124fca9d0e0ce8da60 Mon Sep 17 00:00:00 2001 From: Bjarne Koll Date: Fri, 14 Jun 2024 11:07:50 +0200 Subject: [PATCH] 960 --- .../server/Per-world-ticks-per-spawn-settings.patch | 0 ...operly-track-the-changed-item-from-dispense-events.patch | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename patches/{unapplied => }/server/Per-world-ticks-per-spawn-settings.patch (100%) rename patches/{unapplied => }/server/Properly-track-the-changed-item-from-dispense-events.patch (97%) 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