diff --git a/pom.xml b/pom.xml index d423d74f..769d2c31 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.massivecraft Factions - 1.6.9.5-U0.2.1-1.4-BETA + 1.6.9.5-U0.2.1-1.4.1-BETA jar SaberFactions diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsExploitListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsExploitListener.java index 40f76b62..29cbd95e 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsExploitListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsExploitListener.java @@ -28,11 +28,24 @@ public class FactionsExploitListener implements Listener { // thanks to ObGenBlocker and WorldGuard for this method Block block = event.getToBlock(); + + // Added this so it wont die on 1.14 :) + if (SaberFactions.plugin.mc114) { + Material source = event.getBlock().getType(); + Material target = block.getType(); + if ((target == Material.REDSTONE_WIRE || target == Material.TRIPWIRE) && (source == Material.AIR || source == Material.LEGACY_STATIONARY_LAVA || source == Material.LEGACY_LAVA)) { + block.setType(Material.AIR); + } + return; + } + + // run this for all versions below 1.14 int source = event.getBlock().getType().getId(); int target = block.getType().getId(); if ((target == 55 || target == 132) && (source == 0 || source == 10 || source == 11)) { block.setType(Material.AIR); } + } @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)