From de16f28c81874f621d2e4bd2c624329e2b0c09d3 Mon Sep 17 00:00:00 2001 From: PikaMug <2267126+PikaMug@users.noreply.github.com> Date: Sun, 23 Aug 2020 20:19:03 -0400 Subject: [PATCH] Do not show condition status when selecting block --- .../main/java/me/blackvein/quests/Quester.java | 15 +++++++++++++++ .../blackvein/quests/listeners/BlockListener.java | 3 +++ 2 files changed, 18 insertions(+) diff --git a/main/src/main/java/me/blackvein/quests/Quester.java b/main/src/main/java/me/blackvein/quests/Quester.java index 9bd43dc78..c61efdf4c 100644 --- a/main/src/main/java/me/blackvein/quests/Quester.java +++ b/main/src/main/java/me/blackvein/quests/Quester.java @@ -4177,4 +4177,19 @@ public class Quester { } return true; } + + public boolean isSelectingBlock() { + final UUID uuid = getPlayer().getUniqueId(); + if (plugin.getQuestFactory().getSelectedBlockStarts().containsKey(uuid) + || plugin.getQuestFactory().getSelectedKillLocations().containsKey(uuid) + || plugin.getQuestFactory().getSelectedReachLocations().containsKey(uuid) + || plugin.getActionFactory().getSelectedExplosionLocations().containsKey(uuid) + || plugin.getActionFactory().getSelectedEffectLocations().containsKey(uuid) + || plugin.getActionFactory().getSelectedMobLocations().containsKey(uuid) + || plugin.getActionFactory().getSelectedLightningLocations().containsKey(uuid) + || plugin.getActionFactory().getSelectedTeleportLocations().containsKey(uuid)) { + return true; + } + return false; + } } diff --git a/main/src/main/java/me/blackvein/quests/listeners/BlockListener.java b/main/src/main/java/me/blackvein/quests/listeners/BlockListener.java index 75e01c0f5..fb0672d2b 100644 --- a/main/src/main/java/me/blackvein/quests/listeners/BlockListener.java +++ b/main/src/main/java/me/blackvein/quests/listeners/BlockListener.java @@ -169,6 +169,9 @@ public class BlockListener implements Listener { final Player player = evt.getPlayer(); if (plugin.canUseQuests(evt.getPlayer().getUniqueId())) { final Quester quester = plugin.getQuester(player.getUniqueId()); + if (quester.isSelectingBlock()) { + return; + } if (evt.getAction().equals(Action.RIGHT_CLICK_BLOCK)) { if (evt.isCancelled() == false) { final ItemStack blockItemStack = new ItemStack(evt.getClickedBlock().getType(), 1, evt