diff --git a/plugin.yml b/plugin.yml index fae855d..77b21ee 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,4 +1,4 @@ name: Blacksmith version: 1.0.26 -main: retsrif.Blacksmith.blacksmith +main: retsrif.Blacksmith.Blacksmith author: retsrif \ No newline at end of file diff --git a/src/retsrif/Blacksmith/BPlayerListener.java b/src/retsrif/Blacksmith/BPlayerListener.java index dfe9161..bf6277b 100644 --- a/src/retsrif/Blacksmith/BPlayerListener.java +++ b/src/retsrif/Blacksmith/BPlayerListener.java @@ -10,8 +10,11 @@ import org.bukkit.event.player.PlayerListener; import org.bukkit.inventory.ItemStack; -import com.nijiko.coelho.iConomy.iConomy; -import com.nijiko.coelho.iConomy.system.Account; +//iConomy4 +//import com.nijiko.coelho.iConomy.iConomy; +//import com.nijiko.coelho.iConomy.system.Account; +//iConomy5 +import com.iConomy.iConomy; import cosine.boseconomy.BOSEconomy; @@ -217,10 +220,12 @@ public boolean isBalanceGreaterThanCost(Player player, int cost) { String playerName = player.getName(); if(useIC) { - double balance = iconomy.getBank().getAccount(playerName).getBalance(); + /*double balance = iconomy.getBank().getAccount(playerName).getBalance(); if(balance>cost) - return true; + return true;*/ + if(iConomy.getAccount(playerName).getHoldings().balance()>cost) + return true else return false; } @@ -239,9 +244,11 @@ else if(useBOSE) { public void subtractMoney(Player player, int cost) { String playerName = player.getName(); if(useIC) { - Account account = iconomy.getBank().getAccount(playerName); + /*Account account = iconomy.getBank().getAccount(playerName); double balance = account.getBalance(); - account.setBalance(balance-cost); + account.setBalance(balance-cost);*/ + if(iConomy.hasAccount(playerName)) + iConomy.getAccount(playerName).getHoldings().subtract(cost); } else if(useBOSE) { double balance = bose.getPlayerMoney(playerName); diff --git a/src/retsrif/Blacksmith/BPluginListener.java b/src/retsrif/Blacksmith/BPluginListener.java index 2d7c0f1..2d1f34e 100644 --- a/src/retsrif/Blacksmith/BPluginListener.java +++ b/src/retsrif/Blacksmith/BPluginListener.java @@ -4,7 +4,10 @@ import org.bukkit.event.server.PluginEnableEvent; import org.bukkit.event.server.ServerListener; -import com.nijiko.coelho.iConomy.iConomy; +//iConomy4 +//import com.nijiko.coelho.iConomy.iConomy; +//iConomy5 +import com.iConomy.iConomy; import cosine.boseconomy.BOSEconomy; diff --git a/src/retsrif/Blacksmith/Blacksmith.java b/src/retsrif/Blacksmith/Blacksmith.java index c5117c0..c4c4b1b 100644 --- a/src/retsrif/Blacksmith/Blacksmith.java +++ b/src/retsrif/Blacksmith/Blacksmith.java @@ -8,7 +8,10 @@ import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.util.config.Configuration; -import com.nijiko.coelho.iConomy.iConomy; +//iConomy4 +//import com.nijiko.coelho.iConomy.iConomy; +//iConomy5 +import com.iConomy.iConomy; import cosine.boseconomy.BOSEconomy;