SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Aktivität

Fix more diffs in block package

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Nassim Jahnke 2024-12-18 13:24:47 +01:00
Ursprung 71bcc8c845
Commit dedc6b3394
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: EF6771C01F6EF02F
2 geänderte Dateien mit 7 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

7
paper-server/patches/sources/net/minecraft/world/level/block/LiquidBlock.java.patch
Datei anzeigen

@ -41,10 +41,11 @@
} }
} }
@@ -173,13 +_,21 @@ @@ -172,14 +_,20 @@
BlockPos blockPos = pos.relative(direction.getOpposite());
if (level.getFluidState(blockPos).is(FluidTags.WATER)) { if (level.getFluidState(blockPos).is(FluidTags.WATER)) {
Block block = level.getFluidState(pos).isSource() ? Blocks.OBSIDIAN : Blocks.COBBLESTONE; Block block = level.getFluidState(pos).isSource() ? Blocks.OBSIDIAN : Blocks.COBBLESTONE;
level.setBlockAndUpdate(pos, block.defaultBlockState()); - level.setBlockAndUpdate(pos, block.defaultBlockState());
- this.fizz(level, pos); - this.fizz(level, pos);
+ // CraftBukkit start + // CraftBukkit start
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(level, pos, block.defaultBlockState())) { + if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(level, pos, block.defaultBlockState())) {
@ -55,7 +56,7 @@
} }
if (isSoulSoil && level.getBlockState(blockPos).is(Blocks.BLUE_ICE)) { 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); - this.fizz(level, pos);
+ // CraftBukkit start + // CraftBukkit start
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(level, pos, Blocks.BASALT.defaultBlockState())) { + if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(level, pos, Blocks.BASALT.defaultBlockState())) {

5
paper-server/patches/sources/net/minecraft/world/level/block/SculkVeinBlock.java.patch
Datei anzeigen

@ -17,10 +17,11 @@
BlockState blockState = level.getBlockState(pos); BlockState blockState = level.getBlockState(pos);
TagKey<Block> tagKey = spreader.replaceableBlocks(); TagKey<Block> tagKey = spreader.replaceableBlocks();
@@ -108,6 +_,11 @@ @@ -107,7 +_,11 @@
BlockState blockState1 = level.getBlockState(blockPos);
if (blockState1.is(tagKey)) { if (blockState1.is(tagKey)) {
BlockState blockState2 = Blocks.SCULK.defaultBlockState(); BlockState blockState2 = Blocks.SCULK.defaultBlockState();
level.setBlock(blockPos, blockState2, 3); - level.setBlock(blockPos, blockState2, 3);
+ // CraftBukkit start - Call BlockSpreadEvent + // CraftBukkit start - Call BlockSpreadEvent
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockSpreadEvent(level, sourceBlock, blockPos, blockState2, 3)) { + if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockSpreadEvent(level, sourceBlock, blockPos, blockState2, 3)) {
+ return false; + return false;