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

Fixes ChallengesManager and Completer.

This commit is contained in:
BONNe 2021-09-18 13:01:35 +03:00
parent c8177adb9e
commit edc6d1a5b6
2 changed files with 28 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/main/java/world/bentobox/challenges/managers/ChallengesManager.java
View File

@ -60,47 +60,47 @@ public class ChallengesManager
/** /**
* This config object stores structures for challenge objects. * This config object stores structures for challenge objects.
*/ */
private Database<Challenge> challengeDatabase; private final Database<Challenge> challengeDatabase;
/** /**
* This config object stores structures for challenge level objects. * This config object stores structures for challenge level objects.
*/ */
private Database<ChallengeLevel> levelDatabase; private final Database<ChallengeLevel> levelDatabase;
/** /**
* This database allows to access player challenge data. * This database allows to access player challenge data.
*/ */
private Database<ChallengesPlayerData> playersDatabase; private final Database<ChallengesPlayerData> playersDatabase;
/** /**
* This is local cache that links challenge unique id with challenge object. * This is local cache that links challenge unique id with challenge object.
*/ */
private Map<String, Challenge> challengeCacheData; private final Map<String, Challenge> challengeCacheData;
/** /**
* This is local cache that links level unique id with level object. * This is local cache that links level unique id with level object.
*/ */
private Map<String, ChallengeLevel> levelCacheData; private final Map<String, ChallengeLevel> levelCacheData;
/** /**
* This is local cache that links UUID with corresponding player challenge data. * This is local cache that links UUID with corresponding player challenge data.
*/ */
private Map<String, ChallengesPlayerData> playerCacheData; private final Map<String, ChallengesPlayerData> playerCacheData;
/** /**
* This variable allows to access ChallengesAddon. * This variable allows to access ChallengesAddon.
*/ */
private ChallengesAddon addon; private final ChallengesAddon addon;
/** /**
* This variable allows to access ChallengesAddon settings. * This variable allows to access ChallengesAddon settings.
*/ */
private Settings settings; private final Settings settings;
/** /**
* Island world manager allows to detect which world refferes to which gamemode addon. * Island world manager allows to detect which world refferes to which gamemode addon.
*/ */
private IslandWorldManager islandWorldManager; private final IslandWorldManager islandWorldManager;
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
@ -249,7 +249,6 @@ public class ChallengesManager
* Load challenge silently. Used when loading. * Load challenge silently. Used when loading.
* *
* @param challenge Challenge that must be loaded. * @param challenge Challenge that must be loaded.
* @return true if successful
*/ */
private void loadChallenge(@NonNull Challenge challenge) private void loadChallenge(@NonNull Challenge challenge)
{ {
@ -291,7 +290,9 @@ public class ChallengesManager
} }
this.addon.logWarning("Data for challenge `" + challenge.getUniqueId() + "` is not valid. It could be NULL element in item-stack!"); this.addon.logWarning("Data for challenge `" + challenge.getUniqueId() + "` is not valid. It could be NULL element in item-stack!");
return false;
// Load the challenge but set it as "undeployed"
challenge.setDeployed(false);
} }
if (this.challengeCacheData.containsKey(challenge.getUniqueId())) if (this.challengeCacheData.containsKey(challenge.getUniqueId()))
@ -382,13 +383,11 @@ public class ChallengesManager
{ {
if (user != null) if (user != null)
{ {
user.sendMessage("challenges.errors.load-error", user.sendMessage("challenges.errors.load-error", VALUE, level.getFriendlyName());
VALUE, level.getFriendlyName());
} }
else else
{ {
this.addon.logError( this.addon.logError("Challenge Level '" + level.getUniqueId() + "' is not valid and skipped");
"Challenge Level '" + level.getUniqueId() + "' is not valid and skipped");
} }
return false; return false;
@ -739,7 +738,6 @@ public class ChallengesManager
/** /**
* This method collects all data from challenges database and migrates them. * This method collects all data from challenges database and migrates them.
*/ */
@SuppressWarnings("deprecation")
private boolean migrateChallenges(World world) private boolean migrateChallenges(World world)
{ {
String addonName = Utils.getGameMode(world); String addonName = Utils.getGameMode(world);
@ -772,49 +770,6 @@ public class ChallengesManager
this.challengeDatabase.saveObjectAsync(challenge); this.challengeDatabase.saveObjectAsync(challenge);
this.challengeCacheData.put(challenge.getUniqueId(), challenge); this.challengeCacheData.put(challenge.getUniqueId(), challenge);
} }
// Migrate Requirements.
if (challenge.getRequirements() == null)
{
switch (challenge.getChallengeType())
{
case INVENTORY:
InventoryRequirements inventoryRequirements = new InventoryRequirements();
inventoryRequirements.setRequiredItems(challenge.getRequiredItems());
inventoryRequirements.setTakeItems(challenge.isTakeItems());
inventoryRequirements.setRequiredPermissions(challenge.getRequiredPermissions());
challenge.setRequirements(inventoryRequirements);
break;
case ISLAND:
IslandRequirements islandRequirements = new IslandRequirements();
islandRequirements.setRemoveBlocks(challenge.isRemoveBlocks());
islandRequirements.setRemoveEntities(challenge.isRemoveEntities());
islandRequirements.setRequiredBlocks(challenge.getRequiredBlocks());
islandRequirements.setRequiredEntities(challenge.getRequiredEntities());
islandRequirements.setSearchRadius(challenge.getSearchRadius());
islandRequirements.setRequiredPermissions(challenge.getRequiredPermissions());
challenge.setRequirements(islandRequirements);
break;
case OTHER:
OtherRequirements otherRequirements = new OtherRequirements();
otherRequirements.setRequiredExperience(challenge.getRequiredExperience());
otherRequirements.setRequiredIslandLevel(challenge.getRequiredIslandLevel());
otherRequirements.setRequiredMoney(challenge.getRequiredMoney());
otherRequirements.setTakeExperience(challenge.isTakeExperience());
otherRequirements.setTakeMoney(challenge.isTakeMoney());
otherRequirements.setRequiredPermissions(challenge.getRequiredPermissions());
challenge.setRequirements(otherRequirements);
break;
}
// This save should not involve any upgrades in other parts.
this.challengeDatabase.saveObjectAsync(challenge);
this.challengeCacheData.put(challenge.getUniqueId(), challenge);
}
} }
return updated; return updated;
@ -1834,12 +1789,13 @@ public class ChallengesManager
* @return Challenge that is currently created. * @return Challenge that is currently created.
*/ */
@Nullable @Nullable
public Challenge createChallenge(String uniqueID, Challenge.ChallengeType type, Requirements requirements) public Challenge createChallenge(String uniqueID, String name, Challenge.ChallengeType type, Requirements requirements)
{ {
if (!this.containsChallenge(uniqueID)) if (!this.containsChallenge(uniqueID))
{ {
Challenge challenge = new Challenge(); Challenge challenge = new Challenge();
challenge.setUniqueId(uniqueID); challenge.setUniqueId(uniqueID);
challenge.setFriendlyName(name);
challenge.setRequirements(requirements); challenge.setRequirements(requirements);
challenge.setChallengeType(type); challenge.setChallengeType(type);
@ -2129,15 +2085,18 @@ public class ChallengesManager
/** /**
* This method creates and returns new challenges level with given uniqueID. * This method creates and returns new challenges level with given uniqueID.
* @param uniqueID - new ID for challenge level. * @param uniqueID - new ID for challenge level.
* @param name Name - name of the level.
* @param world World where level is created.
* @return ChallengeLevel that is currently created. * @return ChallengeLevel that is currently created.
*/ */
@Nullable @Nullable
public ChallengeLevel createLevel(String uniqueID, World world) public ChallengeLevel createLevel(String uniqueID, String name, World world)
{ {
if (!this.containsLevel(uniqueID)) if (!this.containsLevel(uniqueID))
{ {
ChallengeLevel level = new ChallengeLevel(); ChallengeLevel level = new ChallengeLevel();
level.setUniqueId(uniqueID); level.setUniqueId(uniqueID);
level.setFriendlyName(name);
level.setWorld(world.getName()); level.setWorld(world.getName());
this.saveLevel(level); this.saveLevel(level);

16
src/main/java/world/bentobox/challenges/tasks/TryToComplete.java
View File

@ -452,7 +452,7 @@ public class TryToComplete
{ {
switch (this.challenge.getChallengeType()) switch (this.challenge.getChallengeType())
{ {
case ISLAND -> { case ISLAND_TYPE -> {
IslandRequirements requirements = this.challenge.getRequirements(); IslandRequirements requirements = this.challenge.getRequirements();
if (result.meetsRequirements && if (result.meetsRequirements &&
@ -469,7 +469,7 @@ public class TryToComplete
this.removeBlocks(result.blocks, result.getFactor()); this.removeBlocks(result.blocks, result.getFactor());
} }
} }
case INVENTORY -> { case INVENTORY_TYPE -> {
// If remove items, then remove them // If remove items, then remove them
if (this.getInventoryRequirements().isTakeItems()) if (this.getInventoryRequirements().isTakeItems())
{ {
@ -492,7 +492,7 @@ public class TryToComplete
} }
} }
} }
case OTHER -> { case OTHER_TYPE -> {
OtherRequirements requirements = this.challenge.getRequirements(); OtherRequirements requirements = this.challenge.getRequirements();
if (this.addon.isEconomyProvided() && requirements.isTakeMoney()) if (this.addon.isEconomyProvided() && requirements.isTakeMoney())
@ -508,7 +508,7 @@ public class TryToComplete
this.user.getPlayer().getTotalExperience() - requirements.getRequiredExperience()); this.user.getPlayer().getTotalExperience() - requirements.getRequiredExperience());
} }
} }
case STATISTIC -> { case STATISTIC_TYPE -> {
StatisticRequirements requirements = this.challenge.getRequirements(); StatisticRequirements requirements = this.challenge.getRequirements();
if (requirements.isReduceStatistic()) if (requirements.isReduceStatistic())
@ -720,19 +720,19 @@ public class TryToComplete
this.user.sendMessage("general.errors.no-permission"); this.user.sendMessage("general.errors.no-permission");
result = EMPTY_RESULT; result = EMPTY_RESULT;
} }
else if (type.equals(ChallengeType.INVENTORY)) else if (type.equals(ChallengeType.INVENTORY_TYPE))
{ {
result = this.checkInventory(this.getAvailableCompletionTimes(maxTimes)); result = this.checkInventory(this.getAvailableCompletionTimes(maxTimes));
} }
else if (type.equals(ChallengeType.ISLAND)) else if (type.equals(ChallengeType.ISLAND_TYPE))
{ {
result = this.checkSurrounding(this.getAvailableCompletionTimes(maxTimes)); result = this.checkSurrounding(this.getAvailableCompletionTimes(maxTimes));
} }
else if (type.equals(ChallengeType.OTHER)) else if (type.equals(ChallengeType.OTHER_TYPE))
{ {
result = this.checkOthers(this.getAvailableCompletionTimes(maxTimes)); result = this.checkOthers(this.getAvailableCompletionTimes(maxTimes));
} }
else if (type.equals(ChallengeType.STATISTIC)) else if (type.equals(ChallengeType.STATISTIC_TYPE))
{ {
result = this.checkStatistic(this.getAvailableCompletionTimes(maxTimes)); result = this.checkStatistic(this.getAvailableCompletionTimes(maxTimes));
} }