From 98d37d5262d4b9520205d2ccc439468db55929bd Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 31 Oct 2021 10:51:34 +0000 Subject: [PATCH] Changed ReforgeTarget#getForItem --- .../willfp/reforges/reforges/meta/ReforgeTarget.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/meta/ReforgeTarget.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/meta/ReforgeTarget.java index e363463..0dd10dc 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/meta/ReforgeTarget.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/meta/ReforgeTarget.java @@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableSet; import com.willfp.eco.core.config.updating.ConfigUpdater; import com.willfp.eco.core.items.TestableItem; import com.willfp.eco.core.recipe.parts.EmptyTestableItem; +import com.willfp.eco.util.NumberUtils; import com.willfp.reforges.ReforgesPlugin; import lombok.Getter; import org.bukkit.inventory.ItemStack; @@ -13,8 +14,8 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.Set; public class ReforgeTarget { @@ -100,11 +101,12 @@ public class ReforgeTarget { */ @Nullable public static ReforgeTarget getForItem(@NotNull final ItemStack item) { - Optional matching = REGISTERED.values().stream() + List matching = REGISTERED.values().stream() .filter(target -> !target.getName().equalsIgnoreCase("all")) .filter(target -> target.matches(item)) - .findFirst(); - return matching.orElse(null); + .toList(); + + return matching.isEmpty() ? null : matching.get(NumberUtils.randInt(0, matching.size() - 1)); } /**