Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for unclaimall command not working if Economy was disabled

Browse Source
This commit is contained in:
Brettflan 2011-10-23 10:04:36 -05:00
parent 9710ec911e
commit 83f690c9c5
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/massivecraft/factions/cmd/CmdUnclaimall.java
View File

@ -28,14 +28,17 @@ public class CmdUnclaimall extends FCommand
@Override @Override
public void perform() public void perform()
{ {
double refund = Econ.calculateTotalLandRefund(myFaction.getLandRounded()); if (Econ.shouldBeUsed())
if(Conf.bankFactionPaysLandCosts)
{ {
if ( ! Econ.modifyMoney(myFaction, refund, "to unclaim all faction land", "for unclaiming all faction land")) return; double refund = Econ.calculateTotalLandRefund(myFaction.getLandRounded());
} if(Conf.bankFactionPaysLandCosts)
else {
{ if ( ! Econ.modifyMoney(myFaction, refund, "to unclaim all faction land", "for unclaiming all faction land")) return;
if ( ! Econ.modifyMoney(fme , refund, "to unclaim all faction land", "for unclaiming all faction land")) return; }
else
{
if ( ! Econ.modifyMoney(fme , refund, "to unclaim all faction land", "for unclaiming all faction land")) return;
}
} }
Board.unclaimAll(myFaction.getId()); Board.unclaimAll(myFaction.getId());

15
src/com/massivecraft/factions/integration/SpoutFeatures.java
View File

@ -103,21 +103,6 @@ public class SpoutFeatures
if (fLoc == null || player.getLastStoodAt().equals(fLoc)) if (fLoc == null || player.getLastStoodAt().equals(fLoc))
mainListener.updateOwnerList(player); mainListener.updateOwnerList(player);
} }
/* // immediate update after a change doesn't seem to work; oh well, delay it slightly
P.p.getServer().getScheduler().scheduleSyncDelayedTask(P.p, new Runnable()
{
@Override
public void run()
{
Set<FPlayer> players = FPlayers.i.getOnline();
for (FPlayer player : players)
{
if (fLoc == null || player.getLastStoodAt() == fLoc)
mainListener.updateOwnerList(player);
}
}
}, 5);*/
} }
// update owner list for specified player // update owner list for specified player