aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0656-Fix-cancelled-powdered-snow-bucket-placement.patch
blob: d1a867e6051b2f5444da1a6f9abcd76f3a5891df (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
From 0000000000000000000000000000000000000000 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.

diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index 8c9ae9ac38def29ae4cd8944395e566e434d46d0..a100c7a53b4b1dac0a01ee65418d44297bcdb93f 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -425,7 +425,7 @@ public final class ItemStack implements DataComponentHolder {
             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) {
@@ -488,7 +488,7 @@ public final class ItemStack implements DataComponentHolder {
                     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());
                     }