From 8084b3e4c0f62a98b3f6331c00194c5c5e481982 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Wed, 1 Aug 2018 02:53:49 +0200 Subject: [PATCH] Respect LAVAFLOW config setting in all cases Fixes #648 --- src/main/java/de/diddiz/LogBlock/LogBlock.java | 2 +- .../java/de/diddiz/LogBlock/listeners/FluidFlowLogging.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/diddiz/LogBlock/LogBlock.java b/src/main/java/de/diddiz/LogBlock/LogBlock.java index 358cd5c..d8137fe 100644 --- a/src/main/java/de/diddiz/LogBlock/LogBlock.java +++ b/src/main/java/de/diddiz/LogBlock/LogBlock.java @@ -158,7 +158,7 @@ public class LogBlock extends JavaPlugin { if (isLogging(Logging.BLOCKPLACE)) { pm.registerEvents(new BlockPlaceLogging(this), this); } - if (isLogging(Logging.BLOCKPLACE) || isLogging(Logging.LAVAFLOW) || isLogging(Logging.WATERFLOW)) { + if (isLogging(Logging.LAVAFLOW) || isLogging(Logging.WATERFLOW)) { pm.registerEvents(new FluidFlowLogging(this), this); } if (isLogging(Logging.BLOCKBREAK)) { diff --git a/src/main/java/de/diddiz/LogBlock/listeners/FluidFlowLogging.java b/src/main/java/de/diddiz/LogBlock/listeners/FluidFlowLogging.java index c1ebe5e..7e9e1b1 100644 --- a/src/main/java/de/diddiz/LogBlock/listeners/FluidFlowLogging.java +++ b/src/main/java/de/diddiz/LogBlock/listeners/FluidFlowLogging.java @@ -33,9 +33,9 @@ public class FluidFlowLogging extends LoggingListener { final Block to = event.getToBlock(); final Material typeTo = to.getType(); final boolean canFlow = BukkitUtils.isEmpty(typeTo) || BukkitUtils.getNonFluidProofBlocks().contains(typeTo); - if (typeFrom == Material.LAVA) { + if (typeFrom == Material.LAVA && wcfg.isLogging(Logging.LAVAFLOW)) { Levelled levelledFrom = (Levelled)blockDataFrom; - if (canFlow && wcfg.isLogging(Logging.LAVAFLOW)) { + if (canFlow) { if (isSurroundedByWater(to) && levelledFrom.getLevel() <= 2) { consumer.queueBlockReplace(new Actor("LavaFlow"), to.getState(), Material.COBBLESTONE.createBlockData()); } else {