Treat a move as a move instead of a despawn+spawn.
This commit is contained in:
parent
05aaa8140d
commit
efa9d6cb59
@ -133,9 +133,7 @@ public class Econ
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Transfer money
|
// Transfer money
|
||||||
if (Money.despawn(amount, null, from))
|
if (Money.move(amount, invoker, from, to))
|
||||||
{
|
|
||||||
if (Money.spawn(amount, null, to))
|
|
||||||
{
|
{
|
||||||
if (notify)
|
if (notify)
|
||||||
{
|
{
|
||||||
@ -145,19 +143,14 @@ public class Econ
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We failed. Try a rollback
|
|
||||||
Money.spawn(amount, null, from);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// if we get here something with the transaction failed
|
// if we get here something with the transaction failed
|
||||||
if (notify)
|
if (invoker != 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));
|
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));
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static Set<UPlayer> getUPlayers(EconomyParticipator ep)
|
public static Set<UPlayer> getUPlayers(EconomyParticipator ep)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user