From 54252e65a649b7bf9ceac135b67f5db3d4cd7090 Mon Sep 17 00:00:00 2001 From: jast Date: Thu, 9 Aug 2012 01:37:18 +0200 Subject: [PATCH] update to gringotts with faction support --- lib/Gringotts.jar | Bin 21909 -> 23177 bytes .../economy/plugins/Economy_Gringotts.java | 47 ++++++++---------- 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/lib/Gringotts.jar b/lib/Gringotts.jar index f18e3a742abd57f61bd78c2131515771b6a574ca..b5a1563cfb3f46f2d28aecef93e4238e0186820e 100644 GIT binary patch delta 8377 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 BS5W`} delta 7229 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 diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_Gringotts.java b/src/net/milkbowl/vault/economy/plugins/Economy_Gringotts.java index 26c3bee..a49d293 100644 --- a/src/net/milkbowl/vault/economy/plugins/Economy_Gringotts.java +++ b/src/net/milkbowl/vault/economy/plugins/Economy_Gringotts.java @@ -31,6 +31,7 @@ import org.bukkit.event.server.PluginDisableEvent; import org.bukkit.event.server.PluginEnableEvent; import org.bukkit.plugin.Plugin; import org.gestern.gringotts.Account; +import org.gestern.gringotts.AccountHolder; import org.gestern.gringotts.Gringotts; import org.gestern.gringotts.PlayerAccountHolder; @@ -90,11 +91,7 @@ public class Economy_Gringotts implements Economy { * @return Success or Failure */ public boolean isEnabled(){ - if (gringotts == null) { - return false; - } else { - return gringotts.isEnabled(); - } + return gringotts != null && gringotts.isEnabled(); } /** @@ -131,6 +128,7 @@ public class Economy_Gringotts implements Economy { * @return Human readable string describing amount */ public String format(double amount) { + // TODO 2-digit formatting return Double.toString(amount); } @@ -156,23 +154,17 @@ public class Economy_Gringotts implements Economy { } /** - * Checks if this player has an account on the server yet + * Checks if this player or entity has an account on the server yet. * This will always return true if the player has joined the server at least once - * as all major economy plugins auto-generate a player account when the player joins the server + * as all major economy plugins auto-generate a player account when the player joins the server. * @param playerName * @return if the player has an account */ public boolean hasAccount(String playerName) { - try{ - Account account = gringotts.accounting.getAccount(new PlayerAccountHolder(playerName)); - if(account != null) - return true; - else - return false; - } - catch (Exception e){ - return false; - } + AccountHolder owner = gringotts.accountHolderFactory.getAccount(playerName); + if (owner == null) return false; + + return gringotts.accounting.getAccount(owner) != null; } @@ -182,7 +174,9 @@ public class Economy_Gringotts implements Economy { * @return Amount currently held in players account */ public double getBalance(String playerName){ - Account account = gringotts.accounting.getAccount(new PlayerAccountHolder(playerName)); + AccountHolder owner = gringotts.accountHolderFactory.getAccount(playerName); + if (owner == null) return 0; + Account account = gringotts.accounting.getAccount(owner); return account.balance(); } @@ -211,7 +205,9 @@ public class Economy_Gringotts implements Economy { return new EconomyResponse(0, 0, ResponseType.FAILURE, "Cannot withdraw a negative amount."); } - PlayerAccountHolder accountHolder = new PlayerAccountHolder(playerName); + AccountHolder accountHolder = gringotts.accountHolderFactory.getAccount(playerName); + if (accountHolder == null) + return new EconomyResponse(0, 0, ResponseType.FAILURE, playerName + " is not a valid account holder."); Account account = gringotts.accounting.getAccount( accountHolder ); @@ -237,7 +233,10 @@ public class Economy_Gringotts implements Economy { return new EconomyResponse(0, 0, ResponseType.FAILURE, "Cannot desposit negative funds"); } - PlayerAccountHolder accountHolder = new PlayerAccountHolder(playerName); + AccountHolder accountHolder = gringotts.accountHolderFactory.getAccount(playerName); + if (accountHolder == null) + return new EconomyResponse(0, 0, ResponseType.FAILURE, playerName + " is not a valid account holder."); + Account account = gringotts.accounting.getAccount( accountHolder ); if (account.add(amount)) @@ -341,12 +340,6 @@ public class Economy_Gringotts implements Economy { * @return if the account creation was successful */ public boolean createPlayerAccount(String playerName) { - if (hasAccount(playerName)) { - return false; - } - else - return true; - - + return hasAccount(playerName); } }