55 lines
3.1 KiB
Diff
55 lines
3.1 KiB
Diff
--- a/net/minecraft/world/level/block/state/BlockBase.java
|
|
+++ b/net/minecraft/world/level/block/state/BlockBase.java
|
|
@@ -81,6 +81,10 @@
|
|
import net.minecraft.world.phys.shapes.VoxelShapeCollision;
|
|
import net.minecraft.world.phys.shapes.VoxelShapes;
|
|
|
|
+// CraftBukkit start
|
|
+import net.minecraft.world.item.context.ItemActionContext;
|
|
+// CraftBukkit end
|
|
+
|
|
public abstract class BlockBase implements FeatureElement {
|
|
|
|
protected static final EnumDirection[] UPDATE_SHAPE_ORDER = new EnumDirection[]{EnumDirection.WEST, EnumDirection.EAST, EnumDirection.NORTH, EnumDirection.SOUTH, EnumDirection.DOWN, EnumDirection.UP};
|
|
@@ -156,6 +160,12 @@
|
|
|
|
protected void onPlace(IBlockData iblockdata, World world, BlockPosition blockposition, IBlockData iblockdata1, boolean flag) {}
|
|
|
|
+ // CraftBukkit start
|
|
+ protected void onPlace(IBlockData iblockdata, World world, BlockPosition blockposition, IBlockData iblockdata1, boolean flag, @Nullable ItemActionContext context) {
|
|
+ this.onPlace(iblockdata, world, blockposition, iblockdata1, flag);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
protected void onRemove(IBlockData iblockdata, World world, BlockPosition blockposition, IBlockData iblockdata1, boolean flag) {
|
|
if (iblockdata.hasBlockEntity() && !iblockdata.is(iblockdata1.getBlock())) {
|
|
world.removeBlockEntity(blockposition);
|
|
@@ -173,8 +183,10 @@
|
|
TileEntity tileentity = iblockdata.hasBlockEntity() ? world.getBlockEntity(blockposition) : null;
|
|
LootParams.a lootparams_a = (new LootParams.a(worldserver)).withParameter(LootContextParameters.ORIGIN, Vec3D.atCenterOf(blockposition)).withParameter(LootContextParameters.TOOL, ItemStack.EMPTY).withOptionalParameter(LootContextParameters.BLOCK_ENTITY, tileentity).withOptionalParameter(LootContextParameters.THIS_ENTITY, explosion.getDirectSourceEntity());
|
|
|
|
- if (explosion.getBlockInteraction() == Explosion.Effect.DESTROY_WITH_DECAY) {
|
|
- lootparams_a.withParameter(LootContextParameters.EXPLOSION_RADIUS, explosion.radius());
|
|
+ // CraftBukkit start - add yield
|
|
+ if (explosion.yield < 1.0F) {
|
|
+ lootparams_a.withParameter(LootContextParameters.EXPLOSION_RADIUS, 1.0F / explosion.yield);
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
iblockdata.spawnAfterBreak(worldserver, blockposition, ItemStack.EMPTY, flag);
|
|
@@ -1066,7 +1078,13 @@
|
|
}
|
|
|
|
public void onPlace(World world, BlockPosition blockposition, IBlockData iblockdata, boolean flag) {
|
|
- this.getBlock().onPlace(this.asState(), world, blockposition, iblockdata, flag);
|
|
+ // CraftBukkit start
|
|
+ this.onPlace(world, blockposition, iblockdata, flag, null);
|
|
+ }
|
|
+
|
|
+ public void onPlace(World world, BlockPosition blockposition, IBlockData iblockdata, boolean flag, @Nullable ItemActionContext context) {
|
|
+ this.getBlock().onPlace(this.asState(), world, blockposition, iblockdata, flag, context);
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
public void onRemove(World world, BlockPosition blockposition, IBlockData iblockdata, boolean flag) {
|