diff --git a/src/main/java/com/songoda/skyblock/command/commands/admin/AdminBank.java b/src/main/java/com/songoda/skyblock/command/commands/admin/AdminBank.java index 09cd258a..2fdf72eb 100644 --- a/src/main/java/com/songoda/skyblock/command/commands/admin/AdminBank.java +++ b/src/main/java/com/songoda/skyblock/command/commands/admin/AdminBank.java @@ -49,15 +49,15 @@ public class AdminBank extends SubCommand { switch (args[0].toLowerCase()) { case "balance": - if (args.length <2) { - messageManager.sendMessage(player, configLoad.getString("Command.Island.Admin.Bank.Balance.Message").replace("%player%", args[1]).replace("%bal%", "" + EconomyManager.formatEconomy(EconomyManager.getBalance(Bukkit.getOfflinePlayer(args[1]))))); - }else { + if (args.length >= 3) { messageManager.sendMessage(player, configLoad.getString("Command.Island.Admin.Bank.Balance.Message").replace("%player%", args[1]).replace("%bal%", "" + EconomyManager.formatEconomy(EconomyManager.getBalance(Bukkit.getOfflinePlayer(island.getOwnerUUID()))))); + } else { + messageManager.sendMessage(player, configLoad.getString("Command.Island.Admin.Bank.Balance.Message").replace("%player%", args[1]).replace("%bal%", "" + EconomyManager.formatEconomy(EconomyManager.getBalance(Bukkit.getOfflinePlayer(args[1]))))); } return; case "deposit": if (args.length >= 3) { - islandManager.getIslandByPlayer(Bukkit.getOfflinePlayer(Objects.requireNonNull(Bukkit.getPlayer(args[1])).getUniqueId())).addToBank(Double.parseDouble(args[2])); + islandManager.getIslandByPlayer(Bukkit.getOfflinePlayer(Bukkit.getPlayer(args[1]).getUniqueId())).addToBank(Double.parseDouble(args[2])); messageManager.sendMessage(player, configLoad.getString("Command.Island.Admin.Bank.SuccesDeposit.Message").replace("%player%",args[1]).replace("%ammount%",EconomyManager.formatEconomy(Double.parseDouble(args[2])))); }else { messageManager.sendMessage(player, configLoad.getString("Command.Island.Admin.Bank.ByConsole.Message")); @@ -154,6 +154,6 @@ public class AdminBank extends SubCommand { @Override public String[] getArguments() { - return new String[0]; + return new String[]{"withdraw", "deposit", "balance", "open"}; } } diff --git a/src/main/java/com/songoda/skyblock/gui/bank/GuiBank.java b/src/main/java/com/songoda/skyblock/gui/bank/GuiBank.java index 370d5bda..bab25d1f 100644 --- a/src/main/java/com/songoda/skyblock/gui/bank/GuiBank.java +++ b/src/main/java/com/songoda/skyblock/gui/bank/GuiBank.java @@ -36,7 +36,6 @@ import java.util.stream.Collectors; public class GuiBank extends Gui { private final SkyBlock plugin; - private final BankManager bankManager; private final SoundManager soundManager; private final Island island; private final FileConfiguration languageLoad; @@ -45,15 +44,16 @@ public class GuiBank extends Gui { public GuiBank(SkyBlock plugin, Island island, Gui returnGui, boolean admin) { super(2, returnGui); this.plugin = plugin;; - this.bankManager = plugin.getBankManager(); this.soundManager = plugin.getSoundManager(); this.island = island; this.admin = admin; this.languageLoad = plugin.getFileManager() .getConfig(new File(plugin.getDataFolder(), "language.yml")).getFileConfiguration(); - setDefaultItem(CompatibleMaterial.BLACK_STAINED_GLASS_PANE.getItem()); - setTitle(TextUtils.formatText(languageLoad.getString("Menu.Bank.Title"))); - paint(); + if(island != null) { + setDefaultItem(CompatibleMaterial.BLACK_STAINED_GLASS_PANE.getItem()); + setTitle(TextUtils.formatText(languageLoad.getString("Menu.Bank.Title"))); + paint(); + } } @Override