mirror of
https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git
synced 2024-11-22 10:06:16 +00:00
81 lines
5.1 KiB
Diff
81 lines
5.1 KiB
Diff
--- a/net/minecraft/world/level/block/PointedDripstoneBlock.java
|
|
+++ b/net/minecraft/world/level/block/PointedDripstoneBlock.java
|
|
@@ -136,6 +136,11 @@
|
|
WorldServer worldserver = (WorldServer) world;
|
|
|
|
if (iprojectile.mayInteract(worldserver, blockposition) && iprojectile.mayBreak(worldserver) && iprojectile instanceof EntityThrownTrident && iprojectile.getDeltaMovement().length() > 0.6D) {
|
|
+ // CraftBukkit start
|
|
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(iprojectile, blockposition, Blocks.AIR.defaultBlockState())) {
|
|
+ return;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
world.destroyBlock(blockposition, true);
|
|
}
|
|
}
|
|
@@ -146,7 +151,7 @@
|
|
@Override
|
|
public void fallOn(World world, IBlockData iblockdata, BlockPosition blockposition, Entity entity, float f) {
|
|
if (iblockdata.getValue(PointedDripstoneBlock.TIP_DIRECTION) == EnumDirection.UP && iblockdata.getValue(PointedDripstoneBlock.THICKNESS) == DripstoneThickness.TIP) {
|
|
- entity.causeFallDamage(f + 2.0F, 2.0F, world.damageSources().stalagmite());
|
|
+ entity.causeFallDamage(f + 2.0F, 2.0F, world.damageSources().stalagmite().directBlock(world, blockposition)); // CraftBukkit
|
|
} else {
|
|
super.fallOn(world, iblockdata, blockposition, entity, f);
|
|
}
|
|
@@ -391,15 +396,15 @@
|
|
if (isUnmergedTipWithDirection(iblockdata, enumdirection.getOpposite())) {
|
|
createMergedTips(iblockdata, worldserver, blockposition1);
|
|
} else if (iblockdata.isAir() || iblockdata.is(Blocks.WATER)) {
|
|
- createDripstone(worldserver, blockposition1, enumdirection, DripstoneThickness.TIP);
|
|
+ createDripstone(worldserver, blockposition1, enumdirection, DripstoneThickness.TIP, blockposition); // CraftBukkit
|
|
}
|
|
|
|
}
|
|
|
|
- private static void createDripstone(GeneratorAccess generatoraccess, BlockPosition blockposition, EnumDirection enumdirection, DripstoneThickness dripstonethickness) {
|
|
+ private static void createDripstone(GeneratorAccess generatoraccess, BlockPosition blockposition, EnumDirection enumdirection, DripstoneThickness dripstonethickness, BlockPosition source) { // CraftBukkit
|
|
IBlockData iblockdata = (IBlockData) ((IBlockData) ((IBlockData) Blocks.POINTED_DRIPSTONE.defaultBlockState().setValue(PointedDripstoneBlock.TIP_DIRECTION, enumdirection)).setValue(PointedDripstoneBlock.THICKNESS, dripstonethickness)).setValue(PointedDripstoneBlock.WATERLOGGED, generatoraccess.getFluidState(blockposition).getType() == FluidTypes.WATER);
|
|
|
|
- generatoraccess.setBlock(blockposition, iblockdata, 3);
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockSpreadEvent(generatoraccess, source, blockposition, iblockdata, 3); // CraftBukkit
|
|
}
|
|
|
|
private static void createMergedTips(IBlockData iblockdata, GeneratorAccess generatoraccess, BlockPosition blockposition) {
|
|
@@ -414,8 +419,8 @@
|
|
blockposition1 = blockposition.below();
|
|
}
|
|
|
|
- createDripstone(generatoraccess, blockposition2, EnumDirection.DOWN, DripstoneThickness.TIP_MERGE);
|
|
- createDripstone(generatoraccess, blockposition1, EnumDirection.UP, DripstoneThickness.TIP_MERGE);
|
|
+ createDripstone(generatoraccess, blockposition2, EnumDirection.DOWN, DripstoneThickness.TIP_MERGE, blockposition); // CraftBukkit
|
|
+ createDripstone(generatoraccess, blockposition1, EnumDirection.UP, DripstoneThickness.TIP_MERGE, blockposition); // CraftBukkit
|
|
}
|
|
|
|
public static void spawnDripParticle(World world, BlockPosition blockposition, IBlockData iblockdata) {
|
|
@@ -448,7 +453,7 @@
|
|
|
|
return (BlockPosition) findBlockVertical(generatoraccess, blockposition, enumdirection.getAxisDirection(), bipredicate, (iblockdata1) -> {
|
|
return isTip(iblockdata1, flag);
|
|
- }, i).orElse((Object) null);
|
|
+ }, i).orElse(null); // CraftBukkit - decompile error
|
|
}
|
|
}
|
|
|
|
@@ -564,7 +569,7 @@
|
|
return canDripThrough(world, blockposition1, iblockdata);
|
|
};
|
|
|
|
- return (BlockPosition) findBlockVertical(world, blockposition, EnumDirection.DOWN.getAxisDirection(), bipredicate, predicate, 11).orElse((Object) null);
|
|
+ return (BlockPosition) findBlockVertical(world, blockposition, EnumDirection.DOWN.getAxisDirection(), bipredicate, predicate, 11).orElse(null); // CraftBukkit - decompile error
|
|
}
|
|
|
|
@Nullable
|
|
@@ -573,7 +578,7 @@
|
|
return canDripThrough(world, blockposition1, iblockdata);
|
|
};
|
|
|
|
- return (BlockPosition) findBlockVertical(world, blockposition, EnumDirection.UP.getAxisDirection(), bipredicate, PointedDripstoneBlock::canDrip, 11).orElse((Object) null);
|
|
+ return (BlockPosition) findBlockVertical(world, blockposition, EnumDirection.UP.getAxisDirection(), bipredicate, PointedDripstoneBlock::canDrip, 11).orElse(null); // CraftBukkit - decompile error
|
|
}
|
|
|
|
public static FluidType getCauldronFillFluidType(WorldServer worldserver, BlockPosition blockposition) {
|