--- a/net/minecraft/world/level/material/FluidTypeLava.java
+++ b/net/minecraft/world/level/material/FluidTypeLava.java
@@ -85,6 +85,13 @@
 
                     if (iblockdata.isAir()) {
                         if (this.hasFlammableNeighbours(worldserver, blockposition1)) {
+                            // CraftBukkit start - Prevent lava putting something on fire
+                            if (worldserver.getBlockState(blockposition1).getBlock() != Blocks.FIRE) {
+                                if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(worldserver, blockposition1, blockposition).isCancelled()) {
+                                    continue;
+                                }
+                            }
+                            // CraftBukkit end
                             worldserver.setBlockAndUpdate(blockposition1, BlockFireAbstract.getState(worldserver, blockposition1));
                             return;
                         }
@@ -101,6 +108,14 @@
                     }
 
                     if (worldserver.isEmptyBlock(blockposition2.above()) && this.isFlammable(worldserver, blockposition2)) {
+                        // CraftBukkit start - Prevent lava putting something on fire
+                        BlockPosition up = blockposition2.above();
+                        if (worldserver.getBlockState(up).getBlock() != Blocks.FIRE) {
+                            if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(worldserver, up, blockposition).isCancelled()) {
+                                continue;
+                            }
+                        }
+                        // CraftBukkit end
                         worldserver.setBlockAndUpdate(blockposition2.above(), BlockFireAbstract.getState(worldserver, blockposition2));
                     }
                 }
@@ -196,7 +211,11 @@
 
             if (this.is(TagsFluid.LAVA) && fluid1.is(TagsFluid.WATER)) {
                 if (iblockdata.getBlock() instanceof BlockFluids) {
-                    generatoraccess.setBlock(blockposition, Blocks.STONE.defaultBlockState(), 3);
+                    // CraftBukkit start
+                    if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(generatoraccess.getMinecraftWorld(), blockposition, Blocks.STONE.defaultBlockState(), 3)) {
+                        return;
+                    }
+                    // CraftBukkit end
                 }
 
                 this.fizz(generatoraccess, blockposition);
