From 4c777dee3a58c4d8c601b4f76c80539e994732ad Mon Sep 17 00:00:00 2001 From: Esophose Date: Sat, 27 Apr 2019 14:41:44 -0600 Subject: [PATCH] Language for placeholder missing fix --- .../java/me/goodandevil/skyblock/economy/EconomyManager.java | 5 +++-- .../goodandevil/skyblock/leaderboard/LeaderboardManager.java | 3 +-- src/main/resources/language.yml | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/me/goodandevil/skyblock/economy/EconomyManager.java b/src/main/java/me/goodandevil/skyblock/economy/EconomyManager.java index a75b3eb5..8838fc50 100644 --- a/src/main/java/me/goodandevil/skyblock/economy/EconomyManager.java +++ b/src/main/java/me/goodandevil/skyblock/economy/EconomyManager.java @@ -5,6 +5,7 @@ import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.permission.Permission; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; +import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.plugin.RegisteredServiceProvider; @@ -53,9 +54,9 @@ public class EconomyManager { Bukkit.getServer().getPluginManager().callEvent(new PlayerWithdrawMoneyEvent(player, money)); } - public boolean hasPermission(String world, OfflinePlayer player, String perm) { + public boolean hasPermission(String world, OfflinePlayer offlinePlayer, String perm) { if (permission != null) - return permission.playerHas(world, player, perm); + return permission.playerHas(world, offlinePlayer, perm); return false; } diff --git a/src/main/java/me/goodandevil/skyblock/leaderboard/LeaderboardManager.java b/src/main/java/me/goodandevil/skyblock/leaderboard/LeaderboardManager.java index 6d216270..139e62c1 100644 --- a/src/main/java/me/goodandevil/skyblock/leaderboard/LeaderboardManager.java +++ b/src/main/java/me/goodandevil/skyblock/leaderboard/LeaderboardManager.java @@ -52,8 +52,7 @@ public class LeaderboardManager { for (int i = 0; i < visitManager.getIslands().size(); i++) { UUID ownerUUID = (UUID) visitManager.getIslands().keySet().toArray()[i]; - if (enableExemptions && economyManager.hasPermission( - worldManager.getWorld(IslandWorld.Normal).getName(), + if (enableExemptions && economyManager.hasPermission(worldManager.getWorld(IslandWorld.Normal).getName(), Bukkit.getOfflinePlayer(ownerUUID), "fabledskyblock.island.top.exempt")) continue; diff --git a/src/main/resources/language.yml b/src/main/resources/language.yml index 6af0b51b..c13f6dcd 100644 --- a/src/main/resources/language.yml +++ b/src/main/resources/language.yml @@ -1234,6 +1234,11 @@ Placeholder: Message: "&c0" Non-empty: Message: "&f%placeholder" + fabledskyblock_island_bank_balance_formatted: + Empty: + Message: "&c0" + Non-empty: + Message: "&f%placeholder" fabledskyblock_island_leaderboard_level_rank: Empty: Message: "&c0"