Upstream/addon-challenges
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/Challenges.git synced 2024-11-24 11:36:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #67 from BONNe/patch-3

Browse Source 
Fix logic issue in Other Type challenge
This commit is contained in:
tastybento 2019-01-30 12:33:45 -08:00 committed by GitHub
commit 1fa5e65a57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -764,23 +764,39 @@ public class TryToComplete
*/
private ChallengeResult checkOthers()
{
if (!this.addon.isEconomyProvided() ||
this.challenge.getRequiredMoney() <= 0 ||
!this.addon.getEconomyProvider().has(this.user, this.challenge.getRequiredMoney()))
if (!this.addon.isLevelProvided() &&
this.challenge.getRequiredIslandLevel() != 0)
{
this.user.sendMessage("challenges.missing-addon");
}
else if (!this.addon.isEconomyProvided() &&
this.challenge.getRequiredMoney() != 0)
{
this.user.sendMessage("challenges.missing-addon");
}
else if (this.addon.isEconomyProvided() && this.challenge.getRequiredMoney() < 0)
{
this.user.sendMessage("challenges.incorrect");
}
else if (this.addon.isEconomyProvided() &&
!this.addon.getEconomyProvider().has(this.user, this.challenge.getRequiredMoney()))
{
this.user.sendMessage("challenges.not-enough-money",
"[money]",
Integer.toString(this.challenge.getRequiredMoney()));
}
else if (this.challenge.getRequiredExperience() <= 0 ||
this.user.getPlayer().getTotalExperience() < this.challenge.getRequiredExperience())
else if (this.challenge.getRequiredExperience() < 0)
{
this.user.sendMessage("challenges.incorrect");
}
else if (this.user.getPlayer().getTotalExperience() < this.challenge.getRequiredExperience())
{
this.user.sendMessage("challenges.not-enough-exp",
"[xp]",
Integer.toString(this.challenge.getRequiredExperience()));
}
else if (!this.addon.isLevelProvided() ||
this.addon.getLevelAddon().getIslandLevel(this.world, this.user.getUniqueId()) < this.challenge.getRequiredIslandLevel())
else if (this.addon.isLevelProvided() &&
this.addon.getLevelAddon().getIslandLevel(this.world, this.user.getUniqueId()) < this.challenge.getRequiredIslandLevel())
{
this.user.sendMessage("challenges.error.island-level",
TextVariables.NUMBER,

2
src/main/resources/locales/en-US.yml
View File

@ -218,3 +218,5 @@ challenges:
you-completed: You completed the [challenge] challenge!
you-completed-level: Congratulations, you complete [level]!
you-repeated: You repeated the [challenge] challenge!
missing-addon: It is not possible to complete challenge. Plugin or addon is missing.
incorrect: Current challenge is corupted.