Merge with master

src/com/massivecraft/factions/FPlayer.java

@@ -512,6 +512,24 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
 		}
 	}
 	
+	public boolean canClaimForFaction(Faction forFaction)
+	{
+		if (forFaction.isNone()) return false;
+
+		if
+		(
+			   this.isAdminBypassing()
+			|| (forFaction == this.getFaction() && this.getRole().isAtLeast(Role.MODERATOR))
+			|| (forFaction.isSafeZone() && Permission.MANAGE_SAFE_ZONE.has(getPlayer()))
+			|| (forFaction.isWarZone() && Permission.MANAGE_WAR_ZONE.has(getPlayer()))
+		)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
 	public boolean canClaimForFactionAtLocation(Faction forFaction, Location location, boolean notifyFailure)
 	{
 		String error = null;

src/com/massivecraft/factions/cmd/CmdAutoClaim.java

@@ -2,6 +2,7 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.struct.Role;
 
 public class CmdAutoClaim extends FCommand
 {
@@ -26,12 +27,22 @@ public class CmdAutoClaim extends FCommand
 	public void perform()
 	{
 		Faction forFaction = this.argAsFaction(0, myFaction);
-		if (forFaction == null || (forFaction == myFaction && fme.getAutoClaimFor() == myFaction))
+		if (forFaction == null || forFaction == fme.getAutoClaimFor())
 		{
 			fme.setAutoClaimFor(null);
 			msg("<i>Auto-claiming of land disabled.");
 			return;
 		}
+
+		if (! fme.canClaimForFaction(forFaction))
+		{
+			if (myFaction == forFaction)
+				msg("<b>You must be <h>%s<b> to claim land.", Role.MODERATOR.toString());
+			else
+				msg("<b>You can't claim land for <h>%s<b>.", forFaction.describeTo(fme));
+
+			return;
+		}
 		
 		fme.setAutoClaimFor(forFaction);
 		

src/com/massivecraft/factions/cmd/FCommand.java

@@ -166,7 +166,7 @@ public abstract class FCommand extends MCommand<P>
 		
 		if (msg && ret == null)
 		{
-			this.msg("<b>No player \"<p>%s<b>\" could not be found.", name);			
+			this.msg("<b>No player \"<p>%s<b>\" could be found.", name);			
 		}
 		
 		return ret;