mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-09 13:28:36 +02:00
45 lines
2.1 KiB
Diff
45 lines
2.1 KiB
Diff
From c8b481c1cbefd8df47f43036630d918772939dc7 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Sat, 10 Nov 2018 05:15:21 +0000
|
|
Subject: [PATCH] Fix SpongeAbsortEvent handling
|
|
|
|
Only process drops when the block is actually going to be removed
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java
|
|
index cbc8e8d139..cda6f2b732 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockSponge.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockSponge.java
|
|
@@ -106,7 +106,11 @@ public class BlockSponge extends Block {
|
|
} else if (iblockdata.getBlock() instanceof BlockFluids) {
|
|
// NOP
|
|
} else if (material == Material.WATER_PLANT || material == Material.REPLACEABLE_WATER_PLANT) {
|
|
- iblockdata.a(world, blockposition2, 0);
|
|
+ // Paper start
|
|
+ if (block.getHandle().getMaterial() == Material.AIR) {
|
|
+ iblockdata.dropNaturally(world, blockposition2, 0);
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
}
|
|
world.setTypeAndData(blockposition2, block.getHandle(), block.getFlag());
|
|
@@ -117,3 +121,4 @@ public class BlockSponge extends Block {
|
|
return i > 0;
|
|
}
|
|
}
|
|
+
|
|
diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
|
|
index 08a5acb0ac..aa3547690a 100644
|
|
--- a/src/main/java/net/minecraft/server/IBlockData.java
|
|
+++ b/src/main/java/net/minecraft/server/IBlockData.java
|
|
@@ -236,6 +236,7 @@ public interface IBlockData extends IBlockDataHolder<IBlockData> {
|
|
this.getBlock().a(this, world, blockposition, entity);
|
|
}
|
|
|
|
+ default void dropNaturally(World world, BlockPosition blockPosition, int i) { a(world, blockPosition, i);} // Paper - OBFHELPER
|
|
default void a(World world, BlockPosition blockposition, int i) {
|
|
this.dropNaturally(world, blockposition, 1.0F, i);
|
|
}
|
|
--
|
|
2.20.1
|
|
|