mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-10 12:02:36 +01:00
65bc2541a3
By: md_5 <git@md-5.net>
102 lines
5.5 KiB
Diff
102 lines
5.5 KiB
Diff
--- a/net/minecraft/world/level/block/BigDripleafBlock.java
|
|
+++ b/net/minecraft/world/level/block/BigDripleafBlock.java
|
|
@@ -43,6 +43,11 @@
|
|
import net.minecraft.world.phys.shapes.VoxelShapeCollision;
|
|
import net.minecraft.world.phys.shapes.VoxelShapes;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
+import org.bukkit.event.entity.EntityInteractEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class BigDripleafBlock extends BlockFacingHorizontal implements IBlockFragilePlantElement, IBlockWaterlogged {
|
|
|
|
public static final MapCodec<BigDripleafBlock> CODEC = simpleCodec(BigDripleafBlock::new);
|
|
@@ -117,7 +122,7 @@
|
|
|
|
@Override
|
|
protected void onProjectileHit(World world, IBlockData iblockdata, MovingObjectPositionBlock movingobjectpositionblock, IProjectile iprojectile) {
|
|
- this.setTiltAndScheduleTick(iblockdata, world, movingobjectpositionblock.getBlockPos(), Tilt.FULL, SoundEffects.BIG_DRIPLEAF_TILT_DOWN);
|
|
+ this.setTiltAndScheduleTick(iblockdata, world, movingobjectpositionblock.getBlockPos(), Tilt.FULL, SoundEffects.BIG_DRIPLEAF_TILT_DOWN, iprojectile); // CraftBukkit
|
|
}
|
|
|
|
@Override
|
|
@@ -176,7 +181,20 @@
|
|
protected void entityInside(IBlockData iblockdata, World world, BlockPosition blockposition, Entity entity) {
|
|
if (!world.isClientSide) {
|
|
if (iblockdata.getValue(BigDripleafBlock.TILT) == Tilt.NONE && canEntityTilt(blockposition, entity) && !world.hasNeighborSignal(blockposition)) {
|
|
- this.setTiltAndScheduleTick(iblockdata, world, blockposition, Tilt.UNSTABLE, (SoundEffect) null);
|
|
+ // CraftBukkit start - tilt dripleaf
|
|
+ org.bukkit.event.Cancellable cancellable;
|
|
+ if (entity instanceof EntityHuman) {
|
|
+ cancellable = CraftEventFactory.callPlayerInteractEvent((EntityHuman) entity, org.bukkit.event.block.Action.PHYSICAL, blockposition, null, null, null);
|
|
+ } else {
|
|
+ cancellable = new EntityInteractEvent(entity.getBukkitEntity(), world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()));
|
|
+ world.getCraftServer().getPluginManager().callEvent((EntityInteractEvent) cancellable);
|
|
+ }
|
|
+
|
|
+ if (cancellable.isCancelled()) {
|
|
+ return;
|
|
+ }
|
|
+ this.setTiltAndScheduleTick(iblockdata, world, blockposition, Tilt.UNSTABLE, (SoundEffect) null, entity);
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
}
|
|
@@ -190,9 +208,9 @@
|
|
Tilt tilt = (Tilt) iblockdata.getValue(BigDripleafBlock.TILT);
|
|
|
|
if (tilt == Tilt.UNSTABLE) {
|
|
- this.setTiltAndScheduleTick(iblockdata, worldserver, blockposition, Tilt.PARTIAL, SoundEffects.BIG_DRIPLEAF_TILT_DOWN);
|
|
+ this.setTiltAndScheduleTick(iblockdata, worldserver, blockposition, Tilt.PARTIAL, SoundEffects.BIG_DRIPLEAF_TILT_DOWN, null); // CraftBukkit
|
|
} else if (tilt == Tilt.PARTIAL) {
|
|
- this.setTiltAndScheduleTick(iblockdata, worldserver, blockposition, Tilt.FULL, SoundEffects.BIG_DRIPLEAF_TILT_DOWN);
|
|
+ this.setTiltAndScheduleTick(iblockdata, worldserver, blockposition, Tilt.FULL, SoundEffects.BIG_DRIPLEAF_TILT_DOWN, null); // CraftBukkit
|
|
} else if (tilt == Tilt.FULL) {
|
|
resetTilt(iblockdata, worldserver, blockposition);
|
|
}
|
|
@@ -218,8 +236,10 @@
|
|
return entity.onGround() && entity.position().y > (double) ((float) blockposition.getY() + 0.6875F);
|
|
}
|
|
|
|
- private void setTiltAndScheduleTick(IBlockData iblockdata, World world, BlockPosition blockposition, Tilt tilt, @Nullable SoundEffect soundeffect) {
|
|
- setTilt(iblockdata, world, blockposition, tilt);
|
|
+ // CraftBukkit start
|
|
+ private void setTiltAndScheduleTick(IBlockData iblockdata, World world, BlockPosition blockposition, Tilt tilt, @Nullable SoundEffect soundeffect, @Nullable Entity entity) {
|
|
+ if (!setTilt(iblockdata, world, blockposition, tilt, entity)) return;
|
|
+ // CraftBukkit end
|
|
if (soundeffect != null) {
|
|
playTiltSound(world, blockposition, soundeffect);
|
|
}
|
|
@@ -233,14 +253,21 @@
|
|
}
|
|
|
|
private static void resetTilt(IBlockData iblockdata, World world, BlockPosition blockposition) {
|
|
- setTilt(iblockdata, world, blockposition, Tilt.NONE);
|
|
+ setTilt(iblockdata, world, blockposition, Tilt.NONE, null); // CraftBukkit
|
|
if (iblockdata.getValue(BigDripleafBlock.TILT) != Tilt.NONE) {
|
|
playTiltSound(world, blockposition, SoundEffects.BIG_DRIPLEAF_TILT_UP);
|
|
}
|
|
|
|
}
|
|
|
|
- private static void setTilt(IBlockData iblockdata, World world, BlockPosition blockposition, Tilt tilt) {
|
|
+ // CraftBukkit start
|
|
+ private static boolean setTilt(IBlockData iblockdata, World world, BlockPosition blockposition, Tilt tilt, @Nullable Entity entity) {
|
|
+ if (entity != null) {
|
|
+ if (!CraftEventFactory.callEntityChangeBlockEvent(entity, blockposition, iblockdata.setValue(BigDripleafBlock.TILT, tilt))) {
|
|
+ return false;
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
Tilt tilt1 = (Tilt) iblockdata.getValue(BigDripleafBlock.TILT);
|
|
|
|
world.setBlock(blockposition, (IBlockData) iblockdata.setValue(BigDripleafBlock.TILT, tilt), 2);
|
|
@@ -248,6 +275,7 @@
|
|
world.gameEvent((Entity) null, (Holder) GameEvent.BLOCK_CHANGE, blockposition);
|
|
}
|
|
|
|
+ return true; // CraftBukkit
|
|
}
|
|
|
|
@Override
|