From 947163477bb68d0f76d881cb048eab752c920081 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 8 Jan 2019 16:38:26 +0100 Subject: [PATCH] Do not go over the maximum level for fluids --- .../java/de/diddiz/LogBlock/listeners/FluidFlowLogging.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/diddiz/LogBlock/listeners/FluidFlowLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/FluidFlowLogging.java index 18808fc..f6fce53 100644 --- a/src/main/java/de/diddiz/LogBlock/listeners/FluidFlowLogging.java +++ b/src/main/java/de/diddiz/LogBlock/listeners/FluidFlowLogging.java @@ -53,7 +53,7 @@ public class FluidFlowLogging extends LoggingListener { consumer.queueBlockReplace(new Actor("LavaFlow", source), to.getState(), Material.COBBLESTONE.createBlockData()); } else { Levelled newBlock = (Levelled) blockDataFrom.clone(); - newBlock.setLevel(levelledFrom.getLevel() + 1); + newBlock.setLevel(Math.min(levelledFrom.getMaximumLevel(), levelledFrom.getLevel() + 1)); if (BukkitUtils.isEmpty(typeTo)) { consumer.queueBlockPlace(new Actor("LavaFlow", source), to.getLocation(), newBlock); } else { @@ -70,7 +70,7 @@ public class FluidFlowLogging extends LoggingListener { } else if ((typeFrom == Material.WATER) && wcfg.isLogging(Logging.WATERFLOW)) { Levelled levelledFrom = fromWaterlogged ? null : (Levelled) blockDataFrom; Levelled newBlock = (Levelled) Material.WATER.createBlockData(); - newBlock.setLevel(fromWaterlogged ? 1 : levelledFrom.getLevel() + 1); + newBlock.setLevel(fromWaterlogged ? 1 : Math.min(levelledFrom.getMaximumLevel(), levelledFrom.getLevel() + 1)); if (BukkitUtils.isEmpty(typeTo)) { consumer.queueBlockPlace(new Actor("WaterFlow", source), to.getLocation(), newBlock); } else if (BukkitUtils.getNonFluidProofBlocks().contains(typeTo)) {