Merge pull request #138 from TownyAdvanced/fix/scaffold_glitching

Fix scaffolds being used to glitch upwards.

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.github.townyadvanced</groupId>
   <artifactId>TownyCombat</artifactId>
-  <version>4.2.0</version>
+  <version>4.2.1</version>
   <name>townycombat</name> <!-- Leave lower-cased -->
 
   <properties>

src/main/java/io/github/townyadvanced/townycombat/listeners/TownyCombatTownyEventListener.java

@@ -14,6 +14,8 @@
 import io.github.townyadvanced.townycombat.utils.TownyCombatInventoryUtil;
 import io.github.townyadvanced.townycombat.utils.TownyCombatItemUtil;
 import io.github.townyadvanced.townycombat.utils.TownyCombatMapUtil;
+
+import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -51,13 +53,25 @@ public void on (TownyBuildEvent event) {
         		&& TownyCombatSettings.isBlockGlitchingPreventionEnabled()
         		&& event.isCancelled()) {
 
-        	if (!event.getMaterial().isSolid() && !event.getMaterial().name().endsWith("BUCKET"))
+        	if (!event.getMaterial().isSolid() && notAPeskyBlock(event.getMaterial()))
 				return;
 
             TownyCombatBlockUtil.applyBlockGlitchingPrevention(event.getPlayer());
         }
 	}
 
+	/**
+	 * @param material Material being built.
+	 * @return true when it is not a block players can use to travel upwards.
+	 */
+	private boolean notAPeskyBlock(Material material) {
+		if (material.name().endsWith("BUCKET")   // Water buckets are exploited to swim up.
+		|| material.equals(Material.SCAFFOLDING) // Scaffolds can be climbed up, like water.
+		)
+			return false;
+		return true;
+	}
+
 	@EventHandler
 	public void on(NewDayEvent event) {
 		if (!TownyCombatSettings.isTownyCombatEnabled())