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

Merge remote-tracking branch 'origin/master' into CustomFactionEvents

Browse Source
This commit is contained in:
donington
2012-03-13 04:51:32 -04:00
parent cc772b00ce fbdc0503ba
commit e2f0d049f9
5 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/factions/FPlayer.java
View File

@@ -648,7 +648,7 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
{
double cost = Econ.calculateClaimCost(ownedLand, currentFaction.isNormal());
if (Conf.econClaimUnconnectedFee != 0.0 && forFaction.getLandRoundedInWorld(flocation.getWorldName()) > 0 && !Board.isConnectedLocation(flocation, currentFaction))
if (Conf.econClaimUnconnectedFee != 0.0 && forFaction.getLandRoundedInWorld(flocation.getWorldName()) > 0 && !Board.isConnectedLocation(flocation, forFaction))
cost += Conf.econClaimUnconnectedFee;
if(Conf.bankEnabled && Conf.bankFactionPaysLandCosts && this.hasFaction())