mirror of
https://github.com/BentoBoxWorld/Challenges.git
synced 2024-09-28 14:37:29 +02:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
413429a091
@ -604,7 +604,7 @@ public class EditChallengeGUI extends CommonGUI
|
|||||||
{
|
{
|
||||||
name = this.user.getTranslation("challenges.gui.buttons.admin.required-blocks");
|
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"));
|
description.add(this.user.getTranslation("challenges.gui.descriptions.admin.required-blocks"));
|
||||||
|
|
||||||
for (Map.Entry<Material, Integer> entry : this.challenge.getRequiredBlocks().entrySet())
|
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");
|
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"));
|
description.add(this.user.getTranslation("challenges.gui.descriptions.admin.required-items"));
|
||||||
|
|
||||||
for (ItemStack itemStack : this.challenge.getRequiredItems())
|
for (ItemStack itemStack : this.challenge.getRequiredItems())
|
||||||
@ -847,7 +847,7 @@ public class EditChallengeGUI extends CommonGUI
|
|||||||
description = new ArrayList<>(2);
|
description = new ArrayList<>(2);
|
||||||
description.add(this.user.getTranslation("challenges.gui.descriptions.admin.required-money"));
|
description.add(this.user.getTranslation("challenges.gui.descriptions.admin.required-money"));
|
||||||
description.add(this.user.getTranslation("challenges.gui.descriptions.current-value",
|
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);
|
icon = new ItemStack(this.addon.isEconomyProvided() ? Material.GOLD_INGOT : Material.BARRIER);
|
||||||
clickHandler = (panel, user, clickType, slot) -> {
|
clickHandler = (panel, user, clickType, slot) -> {
|
||||||
|
@ -1066,6 +1066,8 @@ public class TryToComplete
|
|||||||
// Check if entity is inside challenge bounding box
|
// Check if entity is inside challenge bounding box
|
||||||
if (requiredMap.containsKey(entity.getType()))
|
if (requiredMap.containsKey(entity.getType()))
|
||||||
{
|
{
|
||||||
|
entityQueue.add(entity);
|
||||||
|
|
||||||
entitiesFound.putIfAbsent(entity.getType(), 1);
|
entitiesFound.putIfAbsent(entity.getType(), 1);
|
||||||
entitiesFound.computeIfPresent(entity.getType(), (reqEntity, amount) -> amount + 1);
|
entitiesFound.computeIfPresent(entity.getType(), (reqEntity, amount) -> amount + 1);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user