EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Treat a move as a move instead of a despawn+spawn.

Browse Source
This commit is contained in:
Olof Larsson
2013-12-03 18:02:15 +01:00
parent 05aaa8140d
commit efa9d6cb59
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/massivecraft/factions/integration/Econ.java
View File

@@ -133,30 +133,23 @@ 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) sendTransferInfo(invoker, from, to, amount);
{
sendTransferInfo(invoker, from, to, amount);
}
return true;
}
else
{
// We failed. Try a rollback
Money.spawn(amount, null, from);
} }
return true;
} }
else
// if we get here something with the transaction failed
if (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)); // if we get here something with the transaction failed
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));
}
return false;
} }
return false;
} }
public static Set<UPlayer> getUPlayers(EconomyParticipator ep) public static Set<UPlayer> getUPlayers(EconomyParticipator ep)