Add completion blockage for un-deployed challenges.

BentoBoxWorld · Jan 26, 2019 · d6a39b2 · d6a39b2
1 parent 2a6127b
commit d6a39b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/world/bentobox/challenges/panel/TryToComplete.java b/src/main/java/world/bentobox/challenges/panel/TryToComplete.java
@@ -302,7 +302,12 @@ private ChallengeResult checkIfCanCompleteChallenge()
         ChallengeType type = this.challenge.getChallengeType();
 
         // Check the world
-        if (Util.getWorld(this.world) != Util.getWorld(this.user.getWorld()) ||
+        if (!this.challenge.isDeployed())
+        {
+            this.user.sendMessage("challenges.error.not-deployed");
+            result = EMPTY_RESULT;
+        }
+        else if (Util.getWorld(this.world) != Util.getWorld(this.user.getWorld()) ||
             !this.challenge.getUniqueId().startsWith(Util.getWorld(this.world).getName()))
         {
             this.user.sendMessage("general.errors.wrong-world");

diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml
@@ -73,6 +73,7 @@ challenges:
         reward-problem: '&cThere was a problem giving your reward. Ask Admin to check
             log!'
         you-still-need: '&cYou still need [amount] x [item]'
+        not-deployed: '&cChallenge is not deployed.'
     errors:
         challenge-level-not-available: You have not unlocked level to complete this challenge.
         unique-id: Unique ID [id] is already taken. Choose different.