Merge with master

This commit is contained in:
Olof Larsson
2011-10-23 20:53:56 +02:00
18 changed files with 114 additions and 7 deletions

View File

@@ -1,9 +1,14 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.P;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission;
import org.bukkit.ChatColor;
public class CmdMoneyWithdraw extends FCommand
{
public CmdMoneyWithdraw()
@@ -27,8 +32,11 @@ public class CmdMoneyWithdraw extends FCommand
public void perform()
{
double amount = this.argAsDouble(0, 0d);
Faction faction = this.argAsFaction(1, myFaction);
EconomyParticipator faction = this.argAsFaction(1, myFaction);
if (faction == null) return;
Econ.transferMoney(fme, faction, fme, amount);
if (Conf.logMoneyTransactions)
P.p.log(ChatColor.stripColor(P.p.txt.parse("%s withdrew %s from the faction bank: %s", fme.getName(), Econ.moneyString(amount), faction.describeTo(null))));
}
}