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

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
BONNe1704 2019-05-16 10:30:46 +03:00
parent 9704ed32aa 3521495739
commit 413429a091
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/world/bentobox/challenges/panel/admin/EditChallengeGUI.java
View File

@ -604,7 +604,7 @@ public class EditChallengeGUI extends CommonGUI
{
name = this.user.getTranslation("challenges.gui.buttons.admin.required-blocks");
description = new ArrayList<>(this.challenge.getRequiredEntities().size() + 1);
description = new ArrayList<>(this.challenge.getRequiredBlocks().size() + 1);
description.add(this.user.getTranslation("challenges.gui.descriptions.admin.required-blocks"));
for (Map.Entry<Material, Integer> entry : this.challenge.getRequiredBlocks().entrySet())
@ -713,7 +713,7 @@ public class EditChallengeGUI extends CommonGUI
{
name = this.user.getTranslation("challenges.gui.buttons.admin.required-items");
description = new ArrayList<>(this.challenge.getRequiredEntities().size() + 1);
description = new ArrayList<>(this.challenge.getRequiredItems().size() + 1);
description.add(this.user.getTranslation("challenges.gui.descriptions.admin.required-items"));
for (ItemStack itemStack : this.challenge.getRequiredItems())
@ -847,7 +847,7 @@ public class EditChallengeGUI extends CommonGUI
description = new ArrayList<>(2);
description.add(this.user.getTranslation("challenges.gui.descriptions.admin.required-money"));
description.add(this.user.getTranslation("challenges.gui.descriptions.current-value",
"[value]", Long.toString(this.challenge.getRequiredIslandLevel())));
"[value]", Long.toString(this.challenge.getRequiredMoney())));
icon = new ItemStack(this.addon.isEconomyProvided() ? Material.GOLD_INGOT : Material.BARRIER);
clickHandler = (panel, user, clickType, slot) -> {

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

@ -1066,6 +1066,8 @@ public class TryToComplete
// Check if entity is inside challenge bounding box
if (requiredMap.containsKey(entity.getType()))
{
entityQueue.add(entity);
entitiesFound.putIfAbsent(entity.getType(), 1);
entitiesFound.computeIfPresent(entity.getType(), (reqEntity, amount) -> amount + 1);