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

Merge branch 'master' of github.com:MassiveCraft/Factions

Browse Source
This commit is contained in:
Olof Larsson
2011-11-24 16:27:23 +01:00
parent e935a56ff9 101aa8cabe
commit fc6bfcf061
9 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/factions/cmd/CmdDescription.java
View File

@ -38,7 +38,7 @@ public class CmdDescription extends FCommand
for (FPlayer fplayer : FPlayers.i.getOnline())
{
fplayer.msg("<h>%s<i> changed their description to:", myFaction.describeTo(fplayer));
fplayer.msg("<h>"+myFaction.getDescription());
fplayer.msg("<i>"+myFaction.getDescription());
}
}

2
src/com/massivecraft/factions/cmd/CmdUnclaim.java
View File

@ -42,7 +42,7 @@ public class CmdUnclaim extends FCommand
{
double refund = Econ.calculateClaimRefund(myFaction.getLandRounded());
if(Conf.bankFactionPaysLandCosts)
if(Conf.bankEnabled && Conf.bankFactionPaysLandCosts)
{
if ( ! Econ.modifyMoney(myFaction, refund, "to unclaim this land", "for unclaiming this land")) return;
}

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

@ -32,7 +32,7 @@ public class CmdUnclaimall extends FCommand
if (Econ.shouldBeUsed())
{
double refund = Econ.calculateTotalLandRefund(myFaction.getLandRounded());
if(Conf.bankFactionPaysLandCosts)
if(Conf.bankEnabled && Conf.bankFactionPaysLandCosts)
{
if ( ! Econ.modifyMoney(myFaction, refund, "to unclaim all faction land", "for unclaiming all faction land")) return;
}

2
src/com/massivecraft/factions/cmd/FCommand.java
View File

@ -389,7 +389,7 @@ public abstract class FCommand extends MCommand<P>
{
if ( ! Econ.shouldBeUsed() || this.fme == null || cost == 0.0 || fme.hasAdminMode()) return true;
if(Conf.bankFactionPaysLandCosts && fme.hasFaction())
if(Conf.bankEnabled && Conf.bankFactionPaysCosts && fme.hasFaction())
{
if ( ! Econ.modifyMoney(myFaction, -cost, toDoThis, forDoingThis)) return false;
}