diff --git a/pom.xml b/pom.xml index 1161f12..95dce06 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.rsscripting RS-ItemMagnet - 2.0.2 + 2.0.3 21 diff --git a/src/main/java/com/rsscripting/itemmagnet/listeners/RSConvertListener.java b/src/main/java/com/rsscripting/itemmagnet/listeners/RSConvertListener.java index 63e12f7..2f563f1 100644 --- a/src/main/java/com/rsscripting/itemmagnet/listeners/RSConvertListener.java +++ b/src/main/java/com/rsscripting/itemmagnet/listeners/RSConvertListener.java @@ -11,6 +11,7 @@ import com.rsscripting.itemmagnet.managers.PendingConversion; import com.rsscripting.itemmagnet.managers.RSConversionManager; import org.bukkit.Material; +import org.bukkit.Tag; import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -77,24 +78,22 @@ public class RSConvertListener if (targetAssignmentMachine != null) { - Material type = - block.getType(); + Material type = block.getType(); + + if (isIgnoredTargetSelectionBlock(type)) { + return; + } if ( type != Material.HOPPER - && - type != Material.CHEST - && - type != Material.BARREL + && type != Material.CHEST + && type != Material.BARREL ) { - RSMessageUtils.error( player, "Please select a Hopper, Chest, or Barrel." ); - return; - } event.setCancelled(true); @@ -183,24 +182,22 @@ public class RSConvertListener } - Material type = - block.getType(); + Material type = block.getType(); + + if (isIgnoredTargetSelectionBlock(type)) { + return; + } if ( type != Material.HOPPER - && - type != Material.CHEST - && - type != Material.BARREL + && type != Material.CHEST + && type != Material.BARREL ) { - RSMessageUtils.error( player, "Please select a Hopper, Chest, or Barrel." ); - return; - } event.setCancelled(true); @@ -467,4 +464,12 @@ public class RSConvertListener } + private boolean isIgnoredTargetSelectionBlock(Material type) { + return Tag.DOORS.isTagged(type) + || Tag.BUTTONS.isTagged(type) + || Tag.TRAPDOORS.isTagged(type) + || Tag.FENCE_GATES.isTagged(type) + || type == Material.LEVER; + } + } \ No newline at end of file