Upstream
/
addon-challenges
mirror of https://github.com/BentoBoxWorld/Challenges.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add check on permission.

This commit is contained in:
BONNe 2019-01-25 00:20:33 +02:00
parent 0943a48c3c
commit e0f38206aa
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/world/bentobox/challenges/panel/TryToComplete.java
View File

@ -278,7 +278,12 @@ public class TryToComplete
else if (!this.challenge.getEnvironment().isEmpty() &&
!this.challenge.getEnvironment().contains(this.user.getWorld().getEnvironment()))
{
this.user.sendMessage("general.errors.wrong-environment");
this.user.sendMessage("challenges.errors.wrong-environment");
}
// Check permission
else if (!this.checkPermissions())
{
this.user.sendMessage("general.errors.no-permission");
}
else if (type.equals(ChallengeType.INVENTORY))
{
@ -298,6 +303,16 @@ public class TryToComplete
}
/**
* This method checks if user has all required permissions.
* @return true if user has all required permissions, otherwise false.
*/
private boolean checkPermissions()
{
return this.challenge.getRequiredPermissions().isEmpty() ||
this.challenge.getRequiredPermissions().stream().allMatch(s -> this.user.hasPermission(s));
}
/**
* This method runs all commands from command list.
* @param commands List of commands that must be performed.