Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 04:55:47 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-3735: Missing call to BlockFadeEvent

Browse Source
This commit is contained in:
md_5 2018-01-04 08:57:01 +11:00
parent e40c9ef4b9
commit dc7d31b00d
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nms-patches/BlockSoil.patch
View File

@ -12,20 +12,7 @@
public class BlockSoil extends Block {
public static final BlockStateInteger MOISTURE = BlockStateInteger.of("moisture", 0, 7);
@@ -36,6 +41,12 @@
if (i > 0) {
world.setTypeAndData(blockposition, iblockdata.set(BlockSoil.MOISTURE, Integer.valueOf(i - 1)), 2);
} else if (!this.c(world, blockposition)) {
+ // CraftBukkit start
+ org.bukkit.block.Block block = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
+ if (CraftEventFactory.callBlockFadeEvent(block, Blocks.DIRT).isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
b(world, blockposition);
}
} else if (i < 7) {
@@ -45,11 +56,29 @@
@@ -45,14 +50,38 @@
}
public void fallOn(World world, BlockPosition blockposition, Entity entity, float f) {
@ -56,3 +43,12 @@
}
protected static void b(World world, BlockPosition blockposition) {
+ // CraftBukkit start
+ org.bukkit.block.Block block = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
+ if (CraftEventFactory.callBlockFadeEvent(block, Blocks.DIRT).isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
world.setTypeUpdate(blockposition, Blocks.DIRT.getBlockData());
AxisAlignedBB axisalignedbb = BlockSoil.c.a(blockposition);
List list = world.getEntities((Entity) null, axisalignedbb);