From cf075c270ec3339d906a19dd70f523c2f5e654f8 Mon Sep 17 00:00:00 2001 From: Driftay Date: Mon, 13 Apr 2020 13:35:27 -0400 Subject: [PATCH] Addressed Issue: #81 --- .../factions/listeners/FactionsBlockListener.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java index fb0cc063..e008f1e7 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java @@ -180,12 +180,18 @@ public class FactionsBlockListener implements Listener { @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onBlockFromTo(BlockFromToEvent event) { if (!Conf.handleExploitLiquidFlow) return; + if (event.getBlock().isLiquid()) { if (event.getToBlock().isEmpty()) { Faction from = Board.getInstance().getFactionAt(new FLocation(event.getBlock())); Faction to = Board.getInstance().getFactionAt(new FLocation(event.getToBlock())); if (from == to) return; // from faction != to faction + if(to.isSystemFaction()) { + event.setCancelled(true); + return; + } + if (to.isNormal()) { if (from.isNormal() && from.getRelationTo(to).isAlly()) { return;