From b33b24943a102582e973ea9d139d4265b7f3ae27 Mon Sep 17 00:00:00 2001 From: Brettflan Date: Thu, 2 Feb 2012 13:09:43 -0600 Subject: [PATCH] make sure max land setting doesn't apply to factions with infinite power (such as SafeZone and WarZone) --- src/com/massivecraft/factions/FPlayer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/massivecraft/factions/FPlayer.java b/src/com/massivecraft/factions/FPlayer.java index e8a5f038..f0ac1928 100644 --- a/src/com/massivecraft/factions/FPlayer.java +++ b/src/com/massivecraft/factions/FPlayer.java @@ -580,7 +580,8 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator { error = P.p.txt.parse("You can't claim more land! You need more power!"); } - else if (ownedLand >= Conf.claimedLandsMax && Conf.claimedLandsMax != 0) { + else if (Conf.claimedLandsMax != 0 && ownedLand >= Conf.claimedLandsMax && ! forFaction.getFlag(FFlag.INFPOWER)) + { error = P.p.txt.parse("Limit reached. You can't claim more land!"); } else if (currentFaction.getRelationTo(forFaction).isAtLeast(Rel.TRUCE) && ! currentFaction.isNone())