From 140e68625ce0ceb5ee69643e8986564c1d6d744d Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Fri, 8 Oct 2021 13:12:58 -0700
Subject: [PATCH] Fix cancelled powdered snow bucket placement

Cancelling the placement of powdered snow from the powdered
snow bucket didn't revert grass that became snowy because of the
placement.
---
 .../sources/net/minecraft/world/item/ItemStack.java.patch     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/paper-server/patches/sources/net/minecraft/world/item/ItemStack.java.patch b/paper-server/patches/sources/net/minecraft/world/item/ItemStack.java.patch
index d96b1d04a7..bcce8abe2a 100644
--- a/paper-server/patches/sources/net/minecraft/world/item/ItemStack.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/item/ItemStack.java.patch
@@ -170,7 +170,7 @@
 +            int oldCount = this.getCount();
 +            ServerLevel world = (ServerLevel) context.getLevel();
 +
-+            if (!(item instanceof BucketItem || item instanceof SolidBucketItem)) { // if not bucket
++            if (!(item instanceof BucketItem/* || item instanceof SolidBucketItem*/)) { // if not bucket // Paper - Fix cancelled powdered snow bucket placement
 +                world.captureBlockStates = true;
 +                // special case bonemeal
 +                if (item == Items.BONE_MEAL) {
@@ -234,7 +234,7 @@
 +                    world.capturedBlockStates.clear();
 +                    if (blocks.size() > 1) {
 +                        placeEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockMultiPlaceEvent(world, entityhuman, enumhand, blocks, blockposition.getX(), blockposition.getY(), blockposition.getZ());
-+                    } else if (blocks.size() == 1) {
++                    } else if (blocks.size() == 1 && item != Items.POWDER_SNOW_BUCKET) { // Paper - Fix cancelled powdered snow bucket placement
 +                        placeEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPlaceEvent(world, entityhuman, enumhand, blocks.get(0), blockposition.getX(), blockposition.getY(), blockposition.getZ());
 +                    }
 +