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

Fix an issue when users could do challenges in other gamemodes.

Browse Source 
Fix an issue when users could complete challenges outside their island.
This commit is contained in:
BONNe 2019-01-26 13:47:56 +02:00
parent a55a2f536e
commit ab22651425
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -302,11 +302,18 @@ public class TryToComplete
ChallengeType type = this.challenge.getChallengeType(); ChallengeType type = this.challenge.getChallengeType();
// Check the world // Check the world
if (!this.challenge.getUniqueId().startsWith(Util.getWorld(this.world).getName())) 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"); this.user.sendMessage("general.errors.wrong-world");
result = EMPTY_RESULT; result = EMPTY_RESULT;
} }
// Player is not on island
else if (!this.addon.getIslands().userIsOnIsland(this.user.getWorld(), this.user))
{
this.user.sendMessage("challenges.error.not-on-island");
result = EMPTY_RESULT;
}
// Check if user has unlocked challenges level. // Check if user has unlocked challenges level.
else if (!this.challenge.getLevel().equals(ChallengesManager.FREE) && else if (!this.challenge.getLevel().equals(ChallengesManager.FREE) &&
!this.manager.isLevelUnlocked(this.user, this.world, this.manager.getLevel(this.challenge.getLevel()))) !this.manager.isLevelUnlocked(this.user, this.world, this.manager.getLevel(this.challenge.getLevel())))
@ -556,7 +563,7 @@ public class TryToComplete
{ {
ChallengeResult result; ChallengeResult result;
if (!this.addon.getIslands().userIsOnIsland(this.world, this.user)) if (!this.addon.getIslands().userIsOnIsland(this.user.getWorld(), this.user))
{ {
// Player is not on island // Player is not on island
this.user.sendMessage("challenges.error.not-on-island"); this.user.sendMessage("challenges.error.not-on-island");