38 lines
2.4 KiB
Diff
38 lines
2.4 KiB
Diff
|
From 0000000000000000000000000000000000000000 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/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
|
||
|
|
index 9d2e4adddae481735053c64eec0ee7259c61f1a4..fca5d175cbef24fb0ee2d0bbedc8d1c0af3eb528 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/block/Block.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/block/Block.java
|
||
|
|
@@ -228,6 +228,7 @@ public class Block extends BlockBehaviour implements ItemLike {
|
||
|
|
|
||
|
|
}
|
||
|
|
|
||
|
|
+ public static void dropNaturally(BlockState iblockdata, LevelAccessor generatoraccess, BlockPos blockposition, @Nullable BlockEntity tileentity) { dropResources(iblockdata, generatoraccess, blockposition, tileentity); }
|
||
|
|
public static void dropResources(BlockState state, LevelAccessor world, BlockPos pos, @Nullable BlockEntity blockEntity) {
|
||
|
|
if (world instanceof ServerLevel) {
|
||
|
|
getDrops(state, (ServerLevel) world, pos, blockEntity).forEach((itemstack) -> {
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
|
||
|
|
index c453963ec90cd4eeec845fd0c2137e60dfdd6225..1895c75deee8da40624ba3abbd08ba7cd4f0f503 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java
|
||
|
|
@@ -128,8 +128,11 @@ public class SpongeBlock extends Block {
|
||
|
|
// NOP
|
||
|
|
} else if (material == Material.WATER_PLANT || material == Material.REPLACEABLE_WATER_PLANT) {
|
||
|
|
BlockEntity tileentity = iblockdata.getBlock().isEntityBlock() ? world.getBlockEntity(blockposition2) : null;
|
||
|
|
-
|
||
|
|
- dropResources(iblockdata, world, blockposition2, tileentity);
|
||
|
|
+ // Paper start
|
||
|
|
+ if (block.getHandle().getMaterial() == Material.AIR) {
|
||
|
|
+ dropNaturally(iblockdata, world, blockposition2, tileentity);
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
}
|
||
|
|
}
|
||
|
|
world.setBlock(blockposition2, block.getHandle(), block.getFlag());
|