From 882bdf4c88c5f74f26788b525b6319ed97ff099b Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Wed, 24 Apr 2013 20:17:20 +0200
Subject: [PATCH] Thanks @AEtherSurfer, changed the order of faction and radius
 in the claim command and added a maximum radius.

---
 .../factions/cmd/CmdFactionsClaim.java        | 22 ++++++++++++-------
 .../massivecraft/factions/entity/MConf.java   | 10 +++++++++
 .../massivecraft/factions/entity/UConf.java   |  3 ---
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsClaim.java b/src/com/massivecraft/factions/cmd/CmdFactionsClaim.java
index 6e666502..16b83dac 100644
--- a/src/com/massivecraft/factions/cmd/CmdFactionsClaim.java
+++ b/src/com/massivecraft/factions/cmd/CmdFactionsClaim.java
@@ -4,7 +4,7 @@ import com.massivecraft.factions.FPerm;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.cmd.arg.ARFaction;
 import com.massivecraft.factions.entity.Faction;
-import com.massivecraft.factions.entity.UConf;
+import com.massivecraft.factions.entity.MConf;
 import com.massivecraft.factions.task.SpiralTask;
 import com.massivecraft.mcore.cmd.arg.ARInteger;
 import com.massivecraft.mcore.cmd.req.ReqHasPerm;
@@ -19,8 +19,8 @@ public class CmdFactionsClaim extends FCommand
 	{
 		this.addAliases("claim");
 		
-		this.addOptionalArg("faction", "you");
 		this.addOptionalArg("radius", "1");
+		this.addOptionalArg("faction", "you");
 		
 		this.addRequirements(ReqHasPerm.get(Perm.CLAIM.node));
 		this.addRequirements(ReqIsPlayer.get());
@@ -30,12 +30,12 @@ public class CmdFactionsClaim extends FCommand
 	public void perform()
 	{
 		// Args
-		final Faction forFaction = this.arg(0, ARFaction.get(me));
-		if (forFaction == null) return;
-		
-		Integer radius = this.arg(1, ARInteger.get(), 1);
+		Integer radius = this.arg(0, ARInteger.get(), 1);
 		if (radius == null) return;
 		
+		final Faction forFaction = this.arg(1, ARFaction.get(me), myFaction);
+		if (forFaction == null) return;
+		
 		// FPerm
 		if (!FPerm.TERRITORY.has(sender, forFaction, true)) return;
 		
@@ -45,7 +45,13 @@ public class CmdFactionsClaim extends FCommand
 			msg("<b>If you specify a radius, it must be at least 1.");
 			return;
 		}
-
+		
+		if (radius > MConf.get().radiusClaimRadiusLimit && !fme.isUsingAdminMode())
+		{
+			msg("<b>The maximum radius allowed is <h>%s<b>.", MConf.get().radiusClaimRadiusLimit);
+			return;
+		}
+		
 		// Apply
 		
 		// single chunk
@@ -70,7 +76,7 @@ public class CmdFactionsClaim extends FCommand
 		new SpiralTask(PS.valueOf(me), radius)
 		{
 			private int failCount = 0;
-			private final int limit = UConf.get(me).radiusClaimFailureLimit - 1;
+			private final int limit = MConf.get().radiusClaimFailureLimit - 1;
 
 			@Override
 			public boolean work()
diff --git a/src/com/massivecraft/factions/entity/MConf.java b/src/com/massivecraft/factions/entity/MConf.java
index 3fdc35f9..e0bce620 100644
--- a/src/com/massivecraft/factions/entity/MConf.java
+++ b/src/com/massivecraft/factions/entity/MConf.java
@@ -51,6 +51,16 @@ public class MConf extends Entity<MConf>
 	public boolean removePlayerDataWhenBanned = true;
 	public double removePlayerDataAfterInactiveDays = 20.0;
 	
+	// -------------------------------------------- //
+	// CLAIM LIMITS
+	// -------------------------------------------- //
+	
+	// if someone is doing a radius claim and the process fails to claim land this many times in a row, it will exit
+	public int radiusClaimFailureLimit = 9;
+	
+	// the maximum radius allowed when using the claim command.
+	public int radiusClaimRadiusLimit = 5;
+	
 	// -------------------------------------------- //
 	// CHAT
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/factions/entity/UConf.java b/src/com/massivecraft/factions/entity/UConf.java
index 805e681c..cf5d9a60 100644
--- a/src/com/massivecraft/factions/entity/UConf.java
+++ b/src/com/massivecraft/factions/entity/UConf.java
@@ -75,9 +75,6 @@ public class UConf extends Entity<UConf>
 	public boolean claimsCanBeUnconnectedIfOwnedByOtherFaction = true;
 	public int claimsRequireMinFactionMembers = 1;
 	public int claimedLandsMax = 0;
-
-	// if someone is doing a radius claim and the process fails to claim land this many times in a row, it will exit
-	public int radiusClaimFailureLimit = 9;
 	
 	// -------------------------------------------- //
 	// HOMES