Merge pull request #132 from Fruitloopins/master

Ignore passable blocks in blockgitching prevention listeners
TownyAdvanced · Jan 13, 2024 · 97ca064 · 97ca064
2 parents 65f1768 + d9aa5cb
commit 97ca064
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/...ain/java/io/github/townyadvanced/townycombat/listeners/TownyCombatTownyEventListener.java b/...ain/java/io/github/townyadvanced/townycombat/listeners/TownyCombatTownyEventListener.java
@@ -14,6 +14,7 @@
 import io.github.townyadvanced.townycombat.utils.TownyCombatInventoryUtil;
 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;
@@ -37,6 +38,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());
         }
 	}
@@ -46,6 +50,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());
         }
 	}