From a0a2a833339aa469591459261f254f70788f16e6 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Wed, 7 Feb 2024 23:14:38 +0100 Subject: [PATCH] Use ignoreCancelled instead of checking it manually --- .../blocks/AnvilDisplay.java | 15 +++---------- .../blocks/BarrelDisplay.java | 10 ++------- .../blocks/BeeHiveDisplay.java | 15 +++---------- .../blocks/BeeNestDisplay.java | 15 +++---------- .../blocks/BlastFurnaceDisplay.java | 15 +++---------- .../blocks/BrewingStandDisplay.java | 10 ++------- .../blocks/CartographyTableDisplay.java | 10 ++------- .../blocks/ChestDisplay.java | 10 ++------- .../blocks/ConduitDisplay.java | 5 +---- .../blocks/CraftingTableDisplay.java | 15 +++---------- .../blocks/DispenserDisplay.java | 10 ++------- .../blocks/DoubleChestDisplay.java | 10 ++------- .../blocks/DropperDisplay.java | 10 ++------- .../blocks/EnchantmentTableDisplay.java | 22 ++++--------------- .../blocks/EnderchestDisplay.java | 15 +++---------- .../blocks/FurnaceDisplay.java | 15 +++---------- .../blocks/GrindstoneDisplay.java | 15 +++---------- .../blocks/HopperDisplay.java | 10 ++------- .../blocks/LoomDisplay.java | 15 +++---------- .../blocks/ShulkerBoxDisplay.java | 10 ++------- .../blocks/SmithingTableDisplay.java | 15 +++---------- .../blocks/SmokerDisplay.java | 15 +++---------- .../blocks/StonecutterDisplay.java | 15 +++---------- .../entities/VillagerDisplay.java | 5 +---- 24 files changed, 60 insertions(+), 242 deletions(-) diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/AnvilDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/AnvilDisplay.java index be9fbb8..ec8f17e 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/AnvilDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/AnvilDisplay.java @@ -183,14 +183,11 @@ public void process(Player player) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onAnvil(InventoryClickEvent event) { if (VanishUtils.isVanished((Player) event.getWhoClicked())) { return; } - if (event.isCancelled()) { - return; - } if (event.getRawSlot() != 2) { return; } @@ -311,11 +308,8 @@ public void onAnvil(InventoryClickEvent event) { }, 1); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseAnvil(InventoryClickEvent event) { - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } @@ -341,11 +335,8 @@ public void onUseAnvil(InventoryClickEvent event) { } } - @EventHandler + @EventHandler(ignoreCancelled = true) public void onDragAnvil(InventoryDragEvent event) { - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/BarrelDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/BarrelDisplay.java index 6c7e23e..b2be97b 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/BarrelDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/BarrelDisplay.java @@ -66,12 +66,9 @@ public EntryKey key() { return KEY; } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseBarrel(InventoryClickEvent event) { Player player = (Player) event.getWhoClicked(); - if (event.isCancelled()) { - return; - } if (VanishUtils.isVanished(player)) { return; } @@ -236,12 +233,9 @@ public void onUseBarrel(InventoryClickEvent event) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onDragBarrel(InventoryDragEvent event) { Player player = (Player) event.getWhoClicked(); - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/BeeHiveDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/BeeHiveDisplay.java index 7750b1c..d458a8e 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/BeeHiveDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/BeeHiveDisplay.java @@ -173,30 +173,21 @@ public int run() { }, 0, checkingPeriod).getTaskId(); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onBeeEnterBeehive(EntityEnterBlockEvent event) { - if (event.isCancelled()) { - return; - } Block block = event.getBlock(); Bukkit.getScheduler().runTaskLater(InteractionVisualizer.plugin, () -> updateBlock(block), 1); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onBeeLeaveBeehive(EntityChangeBlockEvent event) { - if (event.isCancelled()) { - return; - } Block block = event.getBlock(); Bukkit.getScheduler().runTaskLater(InteractionVisualizer.plugin, () -> updateBlock(block), 1); } @SuppressWarnings("deprecation") - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onInteractBeehive(PlayerInteractEvent event) { - if (event.isCancelled()) { - return; - } Block block = event.getClickedBlock(); if (block != null) { Bukkit.getScheduler().runTaskLater(InteractionVisualizer.plugin, () -> updateBlock(block), 1); diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/BeeNestDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/BeeNestDisplay.java index bcef627..c84da8e 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/BeeNestDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/BeeNestDisplay.java @@ -173,30 +173,21 @@ public int run() { }, 0, checkingPeriod).getTaskId(); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onBeeEnterBeenest(EntityEnterBlockEvent event) { - if (event.isCancelled()) { - return; - } Block block = event.getBlock(); Bukkit.getScheduler().runTaskLater(InteractionVisualizer.plugin, () -> updateBlock(block), 1); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onBeeLeaveBeenest(EntityChangeBlockEvent event) { - if (event.isCancelled()) { - return; - } Block block = event.getBlock(); Bukkit.getScheduler().runTaskLater(InteractionVisualizer.plugin, () -> updateBlock(block), 1); } @SuppressWarnings("deprecation") - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onInteractBeenest(PlayerInteractEvent event) { - if (event.isCancelled()) { - return; - } Block block = event.getClickedBlock(); if (block != null) { Bukkit.getScheduler().runTaskLater(InteractionVisualizer.plugin, () -> updateBlock(block), 1); diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/BlastFurnaceDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/BlastFurnaceDisplay.java index 9ca19e6..5f8a99d 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/BlastFurnaceDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/BlastFurnaceDisplay.java @@ -292,14 +292,11 @@ public int run() { }, 0, checkingPeriod).getTaskId(); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onBlastFurnace(InventoryClickEvent event) { if (VanishUtils.isVanished((Player) event.getWhoClicked())) { return; } - if (event.isCancelled()) { - return; - } if (event.getRawSlot() != 0 && event.getRawSlot() != 2) { return; } @@ -397,11 +394,8 @@ public void onBlastFurnace(InventoryClickEvent event) { }, 1); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseBlastFurnace(InventoryClickEvent event) { - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } @@ -427,11 +421,8 @@ public void onUseBlastFurnace(InventoryClickEvent event) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onDragBlastFurnace(InventoryDragEvent event) { - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/BrewingStandDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/BrewingStandDisplay.java index a293e8f..86d8f68 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/BrewingStandDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/BrewingStandDisplay.java @@ -270,11 +270,8 @@ public int run() { }, 0, checkingPeriod).getTaskId(); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseBrewingStand(InventoryClickEvent event) { - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } @@ -300,11 +297,8 @@ public void onUseBrewingStand(InventoryClickEvent event) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onDragBrewingStand(InventoryDragEvent event) { - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/CartographyTableDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/CartographyTableDisplay.java index 94edf34..90c2c44 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/CartographyTableDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/CartographyTableDisplay.java @@ -196,11 +196,8 @@ public void process(Player player) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseCartographyTable(InventoryClickEvent event) { - if (event.isCancelled()) { - return; - } if (!playermap.containsKey((Player) event.getWhoClicked())) { return; } @@ -210,11 +207,8 @@ public void onUseCartographyTable(InventoryClickEvent event) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onDragCartographyTable(InventoryDragEvent event) { - if (event.isCancelled()) { - return; - } if (!playermap.containsKey((Player) event.getWhoClicked())) { return; } diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/ChestDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/ChestDisplay.java index 2f83158..0079270 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/ChestDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/ChestDisplay.java @@ -69,12 +69,9 @@ public EntryKey key() { return KEY; } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseChest(InventoryClickEvent event) { Player player = (Player) event.getWhoClicked(); - if (event.isCancelled()) { - return; - } if (VanishUtils.isVanished(player)) { return; } @@ -245,12 +242,9 @@ public void onUseChest(InventoryClickEvent event) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onDragChest(InventoryDragEvent event) { Player player = (Player) event.getWhoClicked(); - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/ConduitDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/ConduitDisplay.java index f753a0d..695339c 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/ConduitDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/ConduitDisplay.java @@ -204,11 +204,8 @@ public int run() { }, 0, checkingPeriod).getTaskId(); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onPlaceConduit(BlockPlaceEvent event) { - if (event.isCancelled()) { - return; - } Block block = event.getBlockPlaced(); if (conduitMap.containsKey(block)) { return; diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/CraftingTableDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/CraftingTableDisplay.java index d55630d..b80e46f 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/CraftingTableDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/CraftingTableDisplay.java @@ -308,11 +308,8 @@ public void process(Player player) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onCraft(InventoryClickEvent event) { - if (event.isCancelled()) { - return; - } if (VanishUtils.isVanished((Player) event.getWhoClicked())) { return; } @@ -460,11 +457,8 @@ public void onCraft(InventoryClickEvent event) { }, 1); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseCraftingBench(InventoryClickEvent event) { - if (event.isCancelled()) { - return; - } if (!playermap.containsKey((Player) event.getWhoClicked())) { return; } @@ -474,11 +468,8 @@ public void onUseCraftingBench(InventoryClickEvent event) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onDragCraftingBench(InventoryDragEvent event) { - if (event.isCancelled()) { - return; - } if (!playermap.containsKey((Player) event.getWhoClicked())) { return; } diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/DispenserDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/DispenserDisplay.java index 90db621..464307f 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/DispenserDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/DispenserDisplay.java @@ -65,12 +65,9 @@ public EntryKey key() { return KEY; } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseDispenser(InventoryClickEvent event) { Player player = (Player) event.getWhoClicked(); - if (event.isCancelled()) { - return; - } if (VanishUtils.isVanished(player)) { return; } @@ -232,12 +229,9 @@ public void onUseDispenser(InventoryClickEvent event) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onDragDispenser(InventoryDragEvent event) { Player player = (Player) event.getWhoClicked(); - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/DoubleChestDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/DoubleChestDisplay.java index 83e07d8..68e7c1c 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/DoubleChestDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/DoubleChestDisplay.java @@ -73,12 +73,9 @@ public EntryKey key() { return KEY; } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseDoubleChest(InventoryClickEvent event) { Player player = (Player) event.getWhoClicked(); - if (event.isCancelled()) { - return; - } if (VanishUtils.isVanished(player)) { return; } @@ -267,12 +264,9 @@ public void onUseDoubleChest(InventoryClickEvent event) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onDragDoubleChest(InventoryDragEvent event) { Player player = (Player) event.getWhoClicked(); - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/DropperDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/DropperDisplay.java index e6453c4..46aba0e 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/DropperDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/DropperDisplay.java @@ -66,12 +66,9 @@ public EntryKey key() { return KEY; } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseDropper(InventoryClickEvent event) { Player player = (Player) event.getWhoClicked(); - if (event.isCancelled()) { - return; - } if (VanishUtils.isVanished(player)) { return; } @@ -236,12 +233,9 @@ public void onUseDropper(InventoryClickEvent event) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onDragDropper(InventoryDragEvent event) { Player player = (Player) event.getWhoClicked(); - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/EnchantmentTableDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/EnchantmentTableDisplay.java index b4fc1bf..8d084ac 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/EnchantmentTableDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/EnchantmentTableDisplay.java @@ -177,14 +177,11 @@ public void process(Player player) { }, 2); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onEnchant(EnchantItemEvent event) { if (VanishUtils.isVanished(event.getEnchanter())) { return; } - if (event.isCancelled()) { - return; - } Block block = event.getEnchantBlock(); Player player = event.getEnchanter(); @@ -212,14 +209,11 @@ public void onEnchant(EnchantItemEvent event) { }, 2); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onEnchantmentTableTake(InventoryClickEvent event) { if (VanishUtils.isVanished((Player) event.getWhoClicked())) { return; } - if (event.isCancelled()) { - return; - } if (event.getRawSlot() != 0) { return; } @@ -269,12 +263,8 @@ public void onEnchantmentTableTake(InventoryClickEvent event) { }, 1); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseEnchantmentTable(InventoryClickEvent event) { - if (event.isCancelled()) { - return; - } - Player player = (Player) event.getWhoClicked(); if (!playermap.containsKey(player)) { @@ -286,12 +276,8 @@ public void onUseEnchantmentTable(InventoryClickEvent event) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onDragEnchantmentTable(InventoryDragEvent event) { - if (event.isCancelled()) { - return; - } - Player player = (Player) event.getWhoClicked(); if (!playermap.containsKey(player)) { diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/EnderchestDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/EnderchestDisplay.java index eea2ef9..81f4a97 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/EnderchestDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/EnderchestDisplay.java @@ -70,11 +70,8 @@ public EntryKey key() { return KEY; } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onOpenEnderChest(InventoryOpenEvent event) { - if (event.isCancelled()) { - return; - } if (VanishUtils.isVanished((Player) event.getPlayer())) { return; } @@ -121,12 +118,9 @@ public void onOpenEnderChest(InventoryOpenEvent event) { playermap.put((Player) event.getPlayer(), block); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseEnderChest(InventoryClickEvent event) { Player player = (Player) event.getWhoClicked(); - if (event.isCancelled()) { - return; - } if (!playermap.containsKey(player)) { return; } @@ -263,12 +257,9 @@ public void onUseEnderChest(InventoryClickEvent event) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onDragEnderChest(InventoryDragEvent event) { Player player = (Player) event.getWhoClicked(); - if (event.isCancelled()) { - return; - } if (!playermap.containsKey(player)) { return; } diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/FurnaceDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/FurnaceDisplay.java index df0c9b0..e0ea936 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/FurnaceDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/FurnaceDisplay.java @@ -294,14 +294,11 @@ public int run() { }, 0, checkingPeriod).getTaskId(); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onFurnace(InventoryClickEvent event) { if (VanishUtils.isVanished((Player) event.getWhoClicked())) { return; } - if (event.isCancelled()) { - return; - } if (event.getRawSlot() != 0 && event.getRawSlot() != 2) { return; } @@ -399,11 +396,8 @@ public void onFurnace(InventoryClickEvent event) { }, 1); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseFurnace(InventoryClickEvent event) { - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } @@ -429,11 +423,8 @@ public void onUseFurnace(InventoryClickEvent event) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onDragFurnace(InventoryDragEvent event) { - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/GrindstoneDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/GrindstoneDisplay.java index a6d64d6..7befe75 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/GrindstoneDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/GrindstoneDisplay.java @@ -179,14 +179,11 @@ public void process(Player player) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onGrindstone(InventoryClickEvent event) { if (VanishUtils.isVanished((Player) event.getWhoClicked())) { return; } - if (event.isCancelled()) { - return; - } if (event.getRawSlot() != 2) { return; } @@ -307,11 +304,8 @@ public void onGrindstone(InventoryClickEvent event) { }, 1); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseGrindstone(InventoryClickEvent event) { - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } @@ -337,11 +331,8 @@ public void onUseGrindstone(InventoryClickEvent event) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onDragGrindstone(InventoryDragEvent event) { - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/HopperDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/HopperDisplay.java index 4f6f006..bdc417b 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/HopperDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/HopperDisplay.java @@ -66,12 +66,9 @@ public EntryKey key() { return KEY; } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseHopper(InventoryClickEvent event) { Player player = (Player) event.getWhoClicked(); - if (event.isCancelled()) { - return; - } if (VanishUtils.isVanished(player)) { return; } @@ -236,12 +233,9 @@ public void onUseHopper(InventoryClickEvent event) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onDragHopper(InventoryDragEvent event) { Player player = (Player) event.getWhoClicked(); - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/LoomDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/LoomDisplay.java index 7ccc2fb..90acb4b 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/LoomDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/LoomDisplay.java @@ -200,14 +200,11 @@ public void process(Player player) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onLoom(InventoryClickEvent event) { if (VanishUtils.isVanished((Player) event.getWhoClicked())) { return; } - if (event.isCancelled()) { - return; - } if (event.getRawSlot() != 0 && event.getRawSlot() != 3) { return; } @@ -311,11 +308,8 @@ public void onLoom(InventoryClickEvent event) { }, 1); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseLoom(InventoryClickEvent event) { - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } @@ -341,11 +335,8 @@ public void onUseLoom(InventoryClickEvent event) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onDragLoom(InventoryDragEvent event) { - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/ShulkerBoxDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/ShulkerBoxDisplay.java index e135822..ed5d920 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/ShulkerBoxDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/ShulkerBoxDisplay.java @@ -67,12 +67,9 @@ public EntryKey key() { return KEY; } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseShulkerbox(InventoryClickEvent event) { Player player = (Player) event.getWhoClicked(); - if (event.isCancelled()) { - return; - } if (VanishUtils.isVanished(player)) { return; } @@ -237,12 +234,9 @@ public void onUseShulkerbox(InventoryClickEvent event) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onDragShulkerbox(InventoryDragEvent event) { Player player = (Player) event.getWhoClicked(); - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/SmithingTableDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/SmithingTableDisplay.java index f98dfec..6150692 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/SmithingTableDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/SmithingTableDisplay.java @@ -201,11 +201,8 @@ public void process(Player player) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onSmithingTable(InventoryClickEvent event) { - if (event.isCancelled()) { - return; - } int maxSlot = event.getView().getTopInventory().getSize() - 1; String maxSlotStr = String.valueOf(maxSlot); if (event.getRawSlot() != maxSlot) { @@ -337,11 +334,8 @@ public void onSmithingTable(InventoryClickEvent event) { }, 1); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseSmithingTable(InventoryClickEvent event) { - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } @@ -354,11 +348,8 @@ public void onUseSmithingTable(InventoryClickEvent event) { } } - @EventHandler + @EventHandler(ignoreCancelled = true) public void onDragSmithingTable(InventoryDragEvent event) { - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/SmokerDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/SmokerDisplay.java index 579de6b..7d1d102 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/SmokerDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/SmokerDisplay.java @@ -292,14 +292,11 @@ public int run() { }, 0, checkingPeriod).getTaskId(); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onSmoker(InventoryClickEvent event) { if (VanishUtils.isVanished((Player) event.getWhoClicked())) { return; } - if (event.isCancelled()) { - return; - } if (event.getRawSlot() != 0 && event.getRawSlot() != 2) { return; } @@ -396,11 +393,8 @@ public void onSmoker(InventoryClickEvent event) { }, 1); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseSmoker(InventoryClickEvent event) { - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } @@ -426,11 +420,8 @@ public void onUseSmoker(InventoryClickEvent event) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onDragSmoker(InventoryDragEvent event) { - if (event.isCancelled()) { - return; - } if (event.getWhoClicked().getGameMode().equals(GameMode.SPECTATOR)) { return; } diff --git a/src/main/java/com/loohp/interactionvisualizer/blocks/StonecutterDisplay.java b/src/main/java/com/loohp/interactionvisualizer/blocks/StonecutterDisplay.java index 85feaa0..a96a69d 100644 --- a/src/main/java/com/loohp/interactionvisualizer/blocks/StonecutterDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/blocks/StonecutterDisplay.java @@ -217,14 +217,11 @@ public void run() { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onStonecutter(InventoryClickEvent event) { if (VanishUtils.isVanished((Player) event.getWhoClicked())) { return; } - if (event.isCancelled()) { - return; - } if (event.getRawSlot() != 1) { return; } @@ -309,11 +306,8 @@ public void onStonecutter(InventoryClickEvent event) { }, 1); } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onUseStonecutter(InventoryClickEvent event) { - if (event.isCancelled()) { - return; - } if (!playermap.containsKey((Player) event.getWhoClicked())) { return; } @@ -323,11 +317,8 @@ public void onUseStonecutter(InventoryClickEvent event) { } } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onDragStonecutter(InventoryDragEvent event) { - if (event.isCancelled()) { - return; - } if (!playermap.containsKey((Player) event.getWhoClicked())) { return; } diff --git a/src/main/java/com/loohp/interactionvisualizer/entities/VillagerDisplay.java b/src/main/java/com/loohp/interactionvisualizer/entities/VillagerDisplay.java index 93e5a82..a15bb1a 100644 --- a/src/main/java/com/loohp/interactionvisualizer/entities/VillagerDisplay.java +++ b/src/main/java/com/loohp/interactionvisualizer/entities/VillagerDisplay.java @@ -54,11 +54,8 @@ public EntryKey key() { return KEY; } - @EventHandler(priority = EventPriority.MONITOR) + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onVillageTrade(InventoryClickEvent event) { - if (event.isCancelled()) { - return; - } if (VanishUtils.isVanished((Player) event.getWhoClicked())) { return; }