From 6c4f5e28658fb4fcfd753a13409db154aeba7576 Mon Sep 17 00:00:00 2001 From: Jonathing Date: Wed, 16 Jul 2025 12:18:45 -0400 Subject: [PATCH] Fix ignitedByLava making blocks permanently flammable (#10570) --- .../net/minecraft/world/level/material/LavaFluid.java.patch | 2 +- .../java/net/minecraftforge/common/extensions/IForgeBlock.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/minecraft/net/minecraft/world/level/material/LavaFluid.java.patch b/patches/minecraft/net/minecraft/world/level/material/LavaFluid.java.patch index 65e83fe84f..79bb1c2ed6 100644 --- a/patches/minecraft/net/minecraft/world/level/material/LavaFluid.java.patch +++ b/patches/minecraft/net/minecraft/world/level/material/LavaFluid.java.patch @@ -40,7 +40,7 @@ } + private boolean isFlammable(LevelReader level, BlockPos pos, Direction face) { -+ return pos.m_123342_() >= level.m_141937_() && pos.m_123342_() < level.m_151558_() && !level.m_46805_(pos) ? false : level.m_8055_(pos).isFlammable(level, pos, face); ++ return pos.m_123342_() >= level.m_141937_() && pos.m_123342_() < level.m_151558_() && !level.m_46805_(pos) ? false : level.m_8055_(pos).m_278200_() && level.m_8055_(pos).isFlammable(level, pos, face); + } + @Nullable diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java b/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java index cf409a900f..8b29eebea6 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java @@ -628,7 +628,7 @@ public interface IForgeBlock */ default boolean isFlammable(BlockState state, BlockGetter level, BlockPos pos, Direction direction) { - return state.ignitedByLava() || state.getFlammability(level, pos, direction) > 0; + return state.getFlammability(level, pos, direction) > 0; } /**