diff options
| author | Nassim Jahnke <[email protected]> | 2024-12-18 13:24:47 +0100 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2024-12-18 13:24:47 +0100 |
| commit | dedc6b339453647f1e8e22bb61f378cfffb6510d (patch) | |
| tree | 6b364ed9aa2ea5fccf5f6f07a52ca833e4251d28 | |
| parent | 71bcc8c8450e25c7a716e63cdf353fcfeac6b3d5 (diff) | |
| download | Paper-dedc6b339453647f1e8e22bb61f378cfffb6510d.tar.gz Paper-dedc6b339453647f1e8e22bb61f378cfffb6510d.zip | |
Fix more diffs in block package
| -rw-r--r-- | paper-server/patches/sources/net/minecraft/world/level/block/LiquidBlock.java.patch | 7 | ||||
| -rw-r--r-- | paper-server/patches/sources/net/minecraft/world/level/block/SculkVeinBlock.java.patch | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/paper-server/patches/sources/net/minecraft/world/level/block/LiquidBlock.java.patch b/paper-server/patches/sources/net/minecraft/world/level/block/LiquidBlock.java.patch index 3589e09e7d..35dc60692f 100644 --- a/paper-server/patches/sources/net/minecraft/world/level/block/LiquidBlock.java.patch +++ b/paper-server/patches/sources/net/minecraft/world/level/block/LiquidBlock.java.patch @@ -41,10 +41,11 @@ } } -@@ -173,13 +_,21 @@ +@@ -172,14 +_,20 @@ + BlockPos blockPos = pos.relative(direction.getOpposite()); if (level.getFluidState(blockPos).is(FluidTags.WATER)) { Block block = level.getFluidState(pos).isSource() ? Blocks.OBSIDIAN : Blocks.COBBLESTONE; - level.setBlockAndUpdate(pos, block.defaultBlockState()); +- level.setBlockAndUpdate(pos, block.defaultBlockState()); - this.fizz(level, pos); + // CraftBukkit start + if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(level, pos, block.defaultBlockState())) { @@ -55,7 +56,7 @@ } if (isSoulSoil && level.getBlockState(blockPos).is(Blocks.BLUE_ICE)) { - level.setBlockAndUpdate(pos, Blocks.BASALT.defaultBlockState()); +- level.setBlockAndUpdate(pos, Blocks.BASALT.defaultBlockState()); - this.fizz(level, pos); + // CraftBukkit start + if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(level, pos, Blocks.BASALT.defaultBlockState())) { diff --git a/paper-server/patches/sources/net/minecraft/world/level/block/SculkVeinBlock.java.patch b/paper-server/patches/sources/net/minecraft/world/level/block/SculkVeinBlock.java.patch index ae401d6908..bc1a1f3a48 100644 --- a/paper-server/patches/sources/net/minecraft/world/level/block/SculkVeinBlock.java.patch +++ b/paper-server/patches/sources/net/minecraft/world/level/block/SculkVeinBlock.java.patch @@ -17,10 +17,11 @@ BlockState blockState = level.getBlockState(pos); TagKey<Block> tagKey = spreader.replaceableBlocks(); -@@ -108,6 +_,11 @@ +@@ -107,7 +_,11 @@ + BlockState blockState1 = level.getBlockState(blockPos); if (blockState1.is(tagKey)) { BlockState blockState2 = Blocks.SCULK.defaultBlockState(); - level.setBlock(blockPos, blockState2, 3); +- level.setBlock(blockPos, blockState2, 3); + // CraftBukkit start - Call BlockSpreadEvent + if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockSpreadEvent(level, sourceBlock, blockPos, blockState2, 3)) { + return false; |