2018-12-23 18:04:13 +01:00
|
|
|
From 7ed195a3a835d7e005ed8dd89add308a50ed4502 Mon Sep 17 00:00:00 2001
|
2018-11-10 06:19:45 +01: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-23 18:04:13 +01:00
|
|
|
index ab1ee37a2..852d98a6b 100644
|
2018-11-10 06:19:45 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/BlockSponge.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/BlockSponge.java
|
2018-12-17 06:18:06 +01:00
|
|
|
@@ -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
|
|
|
|
}
|
2018-11-10 06:19:45 +01:00
|
|
|
}
|
|
|
|
world.setTypeAndData(blockposition2, block.getHandle(), block.getFlag());
|
2018-12-17 06:18:06 +01:00
|
|
|
@@ -117,3 +121,4 @@ public class BlockSponge extends Block {
|
|
|
|
return i > 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
+
|
2018-11-10 06:19:45 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
|
2018-11-11 06:37:15 +01:00
|
|
|
index 2d855aae6..bc345a2c3 100644
|
2018-11-10 06:19:45 +01: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-23 18:04:13 +01:00
|
|
|
2.20.1
|
2018-11-10 06:19:45 +01:00
|
|
|
|