-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix breakNaturally for fluid-logged blocks (#7134)
- Loading branch information
1 parent
75f4cb0
commit 9adc0b2
Showing
1 changed file
with
29 additions
and
0 deletions.
There are no files selected for viewing
29 changes: 29 additions & 0 deletions
29
patches/server/0832-Fix-fluid-logging-on-Block-breakNaturally.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Jake Potrebic <jake.m.potrebic@gmail.com> | ||
Date: Tue, 21 Dec 2021 16:28:17 -0800 | ||
Subject: [PATCH] Fix fluid-logging on Block#breakNaturally | ||
|
||
Leaves fluid if the block broken was fluid-logged which is what | ||
happens if a player breaks a fluid-logged block | ||
|
||
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java | ||
index 89cfa5093d53e1a249efc64aa1b449755c6eecd9..7cf7b845620ab5b118da79f6057c0d80a254585e 100644 | ||
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java | ||
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java | ||
@@ -508,6 +508,7 @@ public class CraftBlock implements Block { | ||
net.minecraft.world.level.block.state.BlockState iblockdata = this.getNMS(); | ||
net.minecraft.world.level.block.Block block = iblockdata.getBlock(); | ||
net.minecraft.world.item.ItemStack nmsItem = CraftItemStack.asNMSCopy(item); | ||
+ net.minecraft.world.level.material.FluidState fluidState = this.world.getFluidState(this.position); // Paper | ||
boolean result = false; | ||
|
||
// Modelled off EntityHuman#hasBlock | ||
@@ -518,7 +519,7 @@ public class CraftBlock implements Block { | ||
} | ||
|
||
// SPIGOT-6778: Directly call setBlock instead of setTypeAndData, so that the tile entiy is not removed and custom remove logic is run. | ||
- return this.world.setBlock(position, Blocks.AIR.defaultBlockState(), 3) && result; | ||
+ return this.world.setBlock(position, fluidState.createLegacyBlock(), 3) && result; // Paper - leave liquid if waterlogged | ||
} | ||
|
||
@Override |