diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java b/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java index 8c12f2de..1a64a8af 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java @@ -38,6 +38,7 @@ import org.bukkit.event.block.Action; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.inventory.EquipmentSlot; import org.bukkit.scheduler.BukkitTask; import java.util.*; @@ -201,8 +202,18 @@ public class Loader implements Listener { if (event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.PHYSICAL) return; + if (event.getClickedBlock().getType() == Material.OBSERVER) return; + + if (event.getHand() == EquipmentSlot.OFF_HAND) { + return; + } + + if (event.getPlayer().getInventory().getItemInMainHand().getType() == Material.TNT) { + return; + } + LoaderButton button = LoaderButton.fromBlock(event.getClickedBlock()); if (button != LoaderButton.INVALID) { actions.add(InteractionActivation.construct(p, event.getClickedBlock().getLocation(), this));