From d9aa5cbe57beb88986843a6efa6b98e0ae4fa3eb Mon Sep 17 00:00:00 2001
From: Fruitloopins <49851457+Fruitloopins@users.noreply.github.com>
Date: Sat, 13 Jan 2024 21:17:23 +1100
Subject: [PATCH] Ignore passable blocks

---
 .../listeners/TownyCombatTownyEventListener.java           | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/io/github/townyadvanced/townycombat/listeners/TownyCombatTownyEventListener.java b/src/main/java/io/github/townyadvanced/townycombat/listeners/TownyCombatTownyEventListener.java
index 420a2e8..9f984b6 100644
--- a/src/main/java/io/github/townyadvanced/townycombat/listeners/TownyCombatTownyEventListener.java
+++ b/src/main/java/io/github/townyadvanced/townycombat/listeners/TownyCombatTownyEventListener.java
@@ -10,6 +10,7 @@
 import io.github.townyadvanced.townycombat.utils.TownyCombatBlockUtil;
 import io.github.townyadvanced.townycombat.utils.TownyCombatItemUtil;
 import io.github.townyadvanced.townycombat.utils.TownyCombatMapUtil;
+import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -33,6 +34,9 @@ public void on (TownyDestroyEvent event) {
         if(TownyCombatSettings.isTownyCombatEnabled() 
 	        	&& TownyCombatSettings.isBlockGlitchingPreventionEnabled()
     	    	&& event.isCancelled()) {
+			Block block = event.getBlock();
+			if (block.isPassable()) return;
+
             TownyCombatBlockUtil.applyBlockGlitchingPrevention(event.getPlayer());
         }
 	}
@@ -42,6 +46,9 @@ public void on (TownyBuildEvent event) {
         if(TownyCombatSettings.isTownyCombatEnabled() 
         		&& TownyCombatSettings.isBlockGlitchingPreventionEnabled()
         		&& event.isCancelled()) {
+			Block block = event.getBlock();
+			if (block.isPassable() && !block.isLiquid()) return;
+
             TownyCombatBlockUtil.applyBlockGlitchingPrevention(event.getPlayer());
         }
 	}