From ed4f0b2ab6831736ee484b9a199c8cd9c2b38ed9 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 2 Nov 2021 09:24:16 +0000 Subject: [PATCH] Fixed EconomyManager and ListUtils --- .../integrations/economy/EconomyManager.java | 23 +++++++++++++------ .../java/com/willfp/eco/util/ListUtils.java | 6 ++--- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyManager.java index b093bedd..ba7de6b6 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyManager.java @@ -26,6 +26,15 @@ public class EconomyManager { registered.add(integration); } + /** + * Get if any economy registrations are registered. + * + * @return If any economy. + */ + public boolean hasRegistrations() { + return !registered.isEmpty(); + } + /** * Get if a player has a certain amount. * @@ -33,8 +42,8 @@ public class EconomyManager { * @param amount The amount. * @return If the player has the amount. */ - boolean hasAmount(@NotNull final OfflinePlayer player, - final double amount) { + public boolean hasAmount(@NotNull final OfflinePlayer player, + final double amount) { for (EconomyWrapper wrapper : registered) { return wrapper.hasAmount(player, amount); } @@ -49,8 +58,8 @@ public class EconomyManager { * @param amount The amount to give. * @return If the transaction was a success. */ - boolean giveMoney(@NotNull final OfflinePlayer player, - final double amount) { + public boolean giveMoney(@NotNull final OfflinePlayer player, + final double amount) { for (EconomyWrapper wrapper : registered) { return wrapper.giveMoney(player, amount); } @@ -65,8 +74,8 @@ public class EconomyManager { * @param amount The amount to remove. * @return If the transaction was a success. */ - boolean removeMoney(@NotNull final OfflinePlayer player, - final double amount) { + public boolean removeMoney(@NotNull final OfflinePlayer player, + final double amount) { for (EconomyWrapper wrapper : registered) { return wrapper.removeMoney(player, amount); } @@ -80,7 +89,7 @@ public class EconomyManager { * @param player The player. * @return The balance. */ - double getBalance(@NotNull final OfflinePlayer player) { + public double getBalance(@NotNull final OfflinePlayer player) { for (EconomyWrapper wrapper : registered) { return wrapper.getBalance(player); } diff --git a/eco-api/src/main/java/com/willfp/eco/util/ListUtils.java b/eco-api/src/main/java/com/willfp/eco/util/ListUtils.java index 5fa91891..4ab07036 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/ListUtils.java +++ b/eco-api/src/main/java/com/willfp/eco/util/ListUtils.java @@ -23,8 +23,8 @@ public class ListUtils { * @return The list, filled will null objects. */ @NotNull - public <@Nullable T> List> create2DList(final int rows, - final int columns) { + public static <@Nullable T> List> create2DList(final int rows, + final int columns) { List> list = new ArrayList<>(rows); while (list.size() < rows) { List row = new ArrayList<>(columns); @@ -45,7 +45,7 @@ public class ListUtils { * @return The frequency map. */ @NotNull - private static Map listToFrequencyMap(@NotNull final List list) { + public static Map listToFrequencyMap(@NotNull final List list) { Map frequencyMap = new HashMap<>(); for (T object : list) { if (frequencyMap.containsKey(object)) {