2018-12-15 01:17:27 +00:00
|
|
|
From 4fa0b38da6fd7cb7ca6af5fdc3cdb608ec74a024 Mon Sep 17 00:00:00 2001
|
2018-11-10 05:19:45 +00:00
|
|
|
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
|
2018-12-15 01:17:27 +00:00
|
|
|
index afd3f32d0..2aa9b68b8 100644
|
2018-11-10 05:19:45 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/BlockSponge.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/BlockSponge.java
|
|
|
|
@@ -100,7 +100,11 @@ public class BlockSponge extends Block {
|
|
|
|
Material material = iblockdata.getMaterial();
|
|
|
|
|
|
|
|
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());
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
|
2018-11-11 05:37:15 +00:00
|
|
|
index 2d855aae6..bc345a2c3 100644
|
2018-11-10 05:19:45 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/IBlockData.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/IBlockData.java
|
|
|
|
@@ -223,6 +223,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);
|
|
|
|
}
|
|
|
|
--
|
2018-12-15 01:17:27 +00:00
|
|
|
2.20.0
|
2018-11-10 05:19:45 +00:00
|
|
|
|