From 4a16f9c1a78e66f83d94a25690e9bbb6c3dbb7cc Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Thu, 30 Apr 2020 10:59:43 +0100
Subject: [PATCH] LiquidFlow true will override BlockPhysics false

---
 .../com/plotsquared/bukkit/listener/PlayerEvents.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
index 986ee586f..759a6b1f8 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
@@ -1386,11 +1386,15 @@ public class PlayerEvents extends PlotListener implements Listener {
         }
         Plot plot = area.getOwnedPlot(tLocation);
         if (plot != null) {
-            if (plot.getFlag(DisablePhysicsFlag.class)) {
+            if (!area.contains(fLocation.getX(), fLocation.getZ()) || !Objects
+                .equals(plot, area.getOwnedPlot(fLocation))) {
                 event.setCancelled(true);
                 return;
-            } else if (!area.contains(fLocation.getX(), fLocation.getZ()) || !Objects
-                .equals(plot, area.getOwnedPlot(fLocation))) {
+            }
+            if (plot.getFlag(LiquidFlowFlag.class) && event.getBlock().isLiquid()) {
+                return;
+            }
+            if (plot.getFlag(DisablePhysicsFlag.class)) {
                 event.setCancelled(true);
                 return;
             }