Money param reorder
This commit is contained in:
parent
efa9d6cb59
commit
5d35754ed6
@ -60,7 +60,7 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
|
|||||||
@Override
|
@Override
|
||||||
public void preDetach(String id)
|
public void preDetach(String id)
|
||||||
{
|
{
|
||||||
Money.set(0, null, this);
|
Money.set(this, null, 0);
|
||||||
|
|
||||||
String universe = this.getUniverse();
|
String universe = this.getUniverse();
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@ public class Econ
|
|||||||
|
|
||||||
if (!Money.exists(uconf.econUniverseAccount)) return;
|
if (!Money.exists(uconf.econUniverseAccount)) return;
|
||||||
|
|
||||||
Money.spawn(delta, null, uconf.econUniverseAccount);
|
Money.spawn(uconf.econUniverseAccount, null, delta);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendBalanceInfo(UPlayer to, EconomyParticipator about)
|
public static void sendBalanceInfo(UPlayer to, EconomyParticipator about)
|
||||||
@ -102,9 +102,9 @@ public class Econ
|
|||||||
|
|
||||||
public static boolean transferMoney(EconomyParticipator invoker, EconomyParticipator from, EconomyParticipator to, double amount)
|
public static boolean transferMoney(EconomyParticipator invoker, EconomyParticipator from, EconomyParticipator to, double amount)
|
||||||
{
|
{
|
||||||
return transferMoney(invoker, from, to, amount, true);
|
return transferMoney(from, to, invoker, amount, true);
|
||||||
}
|
}
|
||||||
public static boolean transferMoney(EconomyParticipator invoker, EconomyParticipator from, EconomyParticipator to, double amount, boolean notify)
|
public static boolean transferMoney(EconomyParticipator from, EconomyParticipator to, EconomyParticipator by, double amount, boolean notify)
|
||||||
{
|
{
|
||||||
if (!isEnabled(from)) return false;
|
if (!isEnabled(from)) return false;
|
||||||
|
|
||||||
@ -119,34 +119,34 @@ public class Econ
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check the rights
|
// Check the rights
|
||||||
if ( ! canIControllYou(invoker, from)) return false;
|
if ( ! canIControllYou(by, from)) return false;
|
||||||
|
|
||||||
// Is there enough money for the transaction to happen?
|
// Is there enough money for the transaction to happen?
|
||||||
if (Money.get(from) < amount)
|
if (Money.get(from) < amount)
|
||||||
{
|
{
|
||||||
// There was not enough money to pay
|
// There was not enough money to pay
|
||||||
if (invoker != null && notify)
|
if (by != null && notify)
|
||||||
{
|
{
|
||||||
invoker.msg("<h>%s<b> can't afford to transfer <h>%s<b> to %s<b>.", from.describeTo(invoker, true), Money.format(amount), to.describeTo(invoker));
|
by.msg("<h>%s<b> can't afford to transfer <h>%s<b> to %s<b>.", from.describeTo(by, true), Money.format(amount), to.describeTo(by));
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Transfer money
|
// Transfer money
|
||||||
if (Money.move(amount, invoker, from, to))
|
if (Money.move(from, to, by, amount))
|
||||||
{
|
{
|
||||||
if (notify)
|
if (notify)
|
||||||
{
|
{
|
||||||
sendTransferInfo(invoker, from, to, amount);
|
sendTransferInfo(by, from, to, amount);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// if we get here something with the transaction failed
|
// if we get here something with the transaction failed
|
||||||
if (invoker != null && notify)
|
if (by != null && notify)
|
||||||
{
|
{
|
||||||
invoker.msg("Unable to transfer %s<b> to <h>%s<b> from <h>%s<b>.", Money.format(amount), to.describeTo(invoker), from.describeTo(invoker, true));
|
by.msg("Unable to transfer %s<b> to <h>%s<b> from <h>%s<b>.", Money.format(amount), to.describeTo(by), from.describeTo(by, true));
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -233,7 +233,7 @@ public class Econ
|
|||||||
|
|
||||||
boolean hasActionDesctription = (actionDescription != null && !actionDescription.isEmpty());
|
boolean hasActionDesctription = (actionDescription != null && !actionDescription.isEmpty());
|
||||||
|
|
||||||
if (Money.spawn(delta, null, ep))
|
if (Money.spawn(ep, null, delta))
|
||||||
{
|
{
|
||||||
modifyUniverseMoney(ep, -delta);
|
modifyUniverseMoney(ep, -delta);
|
||||||
|
|
||||||
|
@ -85,7 +85,7 @@ public class FactionsListenerEcon implements Listener
|
|||||||
double amount = Money.get(faction);
|
double amount = Money.get(faction);
|
||||||
String amountString = Money.format(amount);
|
String amountString = Money.format(amount);
|
||||||
|
|
||||||
Econ.transferMoney(usender, faction, usender, amount, true);
|
Econ.transferMoney(faction, usender, usender, amount, true);
|
||||||
|
|
||||||
usender.msg("<i>You have been given the disbanded faction's bank, totaling %s.", amountString);
|
usender.msg("<i>You have been given the disbanded faction's bank, totaling %s.", amountString);
|
||||||
Factions.get().log(usender.getName() + " has been given bank holdings of "+amountString+" from disbanding "+faction.getName()+".");
|
Factions.get().log(usender.getName() + " has been given bank holdings of "+amountString+" from disbanding "+faction.getName()+".");
|
||||||
|
Loading…
Reference in New Issue
Block a user