From 71a6d8ab44818da9a9f3ce002ba1c7640cdf24b6 Mon Sep 17 00:00:00 2001 From: DarkLiKally Date: Fri, 25 Feb 2011 15:30:28 +0100 Subject: [PATCH] Updated for iConomy 4.0 API --- lib/iConomy.jar | Bin 79910 -> 78718 bytes .../bukkit/commands/CommandBuyRegion.java | 15 ++++++++++----- .../bukkit/commands/CommandRegionClaim.java | 12 ++++++++---- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/lib/iConomy.jar b/lib/iConomy.jar index 178bb02f14e94ef1e9ccf0ab6513d07000dbcebf..ae06ab19c7b6b7e01fbf532aefcdbbb398c368b2 100644 GIT binary patch delta 16490 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

~5#?2%RPH-J2qt94< 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 delta 17108 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 (info)"); } } else { - if (iConomy.database.hasBalance(player.getName())) { - double balance = iConomy.database.getBalance(player.getName()); + if (iConomy.getBank().hasAccount(player.getName())) { + Account account = iConomy.getBank().getAccount(player.getName()); + double balance = account.getBalance(); int regionPrice = flags.getIntFlag("iconomy", "price"); if (balance >= regionPrice) { - iConomy.database.setBalance(player.getName(), balance - regionPrice); + account.subtract(regionPrice); player.sendMessage(ChatColor.YELLOW + "You have bought the region " + id + " for " + iConomy.Misc.formatCurrency(regionPrice, iConomy.currency)); DefaultDomain owners = region.getOwners(); owners.addPlayer(player.getName()); region.setOwners(owners); flags.setFlag("iconomy", "buyable", false); + account.save(); } } else { player.sendMessage(ChatColor.YELLOW + "You have not enough money."); diff --git a/src/com/sk89q/worldguard/bukkit/commands/CommandRegionClaim.java b/src/com/sk89q/worldguard/bukkit/commands/CommandRegionClaim.java index 10c51ffc..34d2ebfc 100644 --- a/src/com/sk89q/worldguard/bukkit/commands/CommandRegionClaim.java +++ b/src/com/sk89q/worldguard/bukkit/commands/CommandRegionClaim.java @@ -32,6 +32,7 @@ import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion; import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion; +import com.nijikokun.bukkit.iConomy.Account; import com.nijikokun.bukkit.iConomy.iConomy; import java.io.IOException; import java.util.logging.Level; @@ -106,18 +107,21 @@ public boolean handle(CommandSender sender, String senderName, String command, S region.getOwners().addPlayer(player.getName()); if (wg.iConomy != null && wg.useiConomy && wg.buyOnClaim) { - if (iConomy.database.hasBalance(player.getName())) { - double balance = iConomy.database.getBalance(player.getName()); + if (iConomy.getBank().hasAccount(player.getName())) { + Account account = iConomy.getBank().getAccount(player.getName()); + double balance = account.getBalance(); int regionCosts = region.countBlocks() * wg.buyOnClaimPrice; if (balance >= regionCosts) { - iConomy.database.setBalance(player.getName(), balance - regionCosts); + account.subtract(regionCosts); player.sendMessage(ChatColor.YELLOW + "You have bought that region for " + iConomy.Misc.formatCurrency(regionCosts, iConomy.currency)); + account.save(); } else { player.sendMessage(ChatColor.RED + "You have not enough money."); player.sendMessage(ChatColor.RED + "The region you want to claim costs " + iConomy.Misc.formatCurrency(regionCosts, iConomy.currency)); - player.sendMessage(ChatColor.RED + "You have " + iConomy.Misc.formatCurrency((int)Math.round(balance), iConomy.currency)); + player.sendMessage(ChatColor.RED + "You have " + iConomy.Misc.formatCurrency( + (int)Math.round(balance), iConomy.currency)); return true; } } else {