From c70f5cf2f35a96543c0c76c209ba02d6d272b593 Mon Sep 17 00:00:00 2001 From: tastybento Date: Mon, 12 Nov 2018 09:55:42 -0800 Subject: [PATCH] Fix error when no blocks required, only entities. Updated POM to use correct Level org. May be related to https://github.com/BentoBoxWorld/addon-challenges/issues/28 --- pom.xml | 2 +- .../java/bentobox/addon/challenges/panel/TryToComplete.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 97eeb81..bca9782 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ provided - bskyblock.addon + world.bentobox Level 0.1.0-SNAPSHOT diff --git a/src/main/java/bentobox/addon/challenges/panel/TryToComplete.java b/src/main/java/bentobox/addon/challenges/panel/TryToComplete.java index fc6c82e..32d7750 100644 --- a/src/main/java/bentobox/addon/challenges/panel/TryToComplete.java +++ b/src/main/java/bentobox/addon/challenges/panel/TryToComplete.java @@ -20,10 +20,10 @@ import bentobox.addon.challenges.ChallengesManager; import bentobox.addon.challenges.commands.ChallengesCommand; import bentobox.addon.challenges.database.object.Challenges; import bentobox.addon.challenges.database.object.Challenges.ChallengeType; -import bentobox.addon.level.Level; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.util.Util; +import world.bentobox.level.Level; /** * Run when a user tries to complete a challenge @@ -169,7 +169,7 @@ public class TryToComplete { } // Check for items or entities in the area ChallengeResult result = searchForEntities(challenge.getRequiredEntities(), challenge.getSearchRadius()); - if (result.meetsRequirements) { + if (result.meetsRequirements && !challenge.getRequiredBlocks().isEmpty()) { // Search for items only if entities found result = searchForBlocks(challenge.getRequiredBlocks(), challenge.getSearchRadius()); }