From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: galacticwarrior9 Date: Thu, 13 Jul 2023 21:32:13 +0100 Subject: [PATCH] Determine lava and water fluid explosion resistance by their block explosion resistance When selecting which explosion resistance to use for lava and water, vanilla selects the highest value between their block explosion resistance and fluid explosion resistance. Problems emerge when we want to reduce the explosion resistance of water or lava, since the fluid explosion resistance is hardcoded to return 100.0F and can't be changed by a plugin. This simply makes the fluid explosion resistance the same as the block explosion resistance, which allows plugin to change the value. Since both are the same in vanilla, this has no side effects on servers that do not need to do this. diff --git a/src/main/java/net/minecraft/world/level/material/LavaFluid.java b/src/main/java/net/minecraft/world/level/material/LavaFluid.java index 72f8b72c6436ca3b8eaeb39c7d3efe2c1462ae1d..c3f8e1e2dd89c168b8b4a15b589109db486bc8d7 100644 --- a/src/main/java/net/minecraft/world/level/material/LavaFluid.java +++ b/src/main/java/net/minecraft/world/level/material/LavaFluid.java @@ -232,7 +232,7 @@ public abstract class LavaFluid extends FlowingFluid { @Override protected float getExplosionResistance() { - return 100.0F; + return Blocks.LAVA.getExplosionResistance(); // Paper } @Override diff --git a/src/main/java/net/minecraft/world/level/material/WaterFluid.java b/src/main/java/net/minecraft/world/level/material/WaterFluid.java index fed9e41fc46f7afd3de27be5425f5b16894e7b9f..97cf555c9111efb155cb8934468f26ebdafbb609 100644 --- a/src/main/java/net/minecraft/world/level/material/WaterFluid.java +++ b/src/main/java/net/minecraft/world/level/material/WaterFluid.java @@ -109,7 +109,7 @@ public abstract class WaterFluid extends FlowingFluid { @Override protected float getExplosionResistance() { - return 100.0F; + return Blocks.WATER.getExplosionResistance(); // Paper } @Override