From f76311c49222900fa79f0e2251a1ffc27d451cfb Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Tue, 25 Oct 2011 22:18:54 +0200
Subject: [PATCH] Claiming now works again :P

---
 src/com/massivecraft/factions/FPlayer.java  | 2 +-
 src/com/massivecraft/factions/Factions.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/massivecraft/factions/FPlayer.java b/src/com/massivecraft/factions/FPlayer.java
index d058a332..d8c0135d 100644
--- a/src/com/massivecraft/factions/FPlayer.java
+++ b/src/com/massivecraft/factions/FPlayer.java
@@ -550,7 +550,7 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
 		{
 			error = P.p.txt.parse("<b>You can't claim more land! You need more power!");
 		}
-		else if (currentFaction.getRelationTo(forFaction).isAtLeast(Rel.TRUCE))
+		else if (currentFaction.getRelationTo(forFaction).isAtLeast(Rel.TRUCE) && ! currentFaction.isNone())
 		{
 			error = P.p.txt.parse("<b>You can't claim this land due to your relation with the current owner.");
 		}
diff --git a/src/com/massivecraft/factions/Factions.java b/src/com/massivecraft/factions/Factions.java
index 768faeef..cb09a174 100644
--- a/src/com/massivecraft/factions/Factions.java
+++ b/src/com/massivecraft/factions/Factions.java
@@ -102,7 +102,7 @@ public class Factions extends EntityCollection<Faction>
 	public void setFlagsForWilderness(Faction faction)
 	{
 		faction.setFlag(FFlag.PERMANENT, true);
-		faction.setFlag(FFlag.PEACEFUL, true);
+		faction.setFlag(FFlag.PEACEFUL, false);
 		faction.setFlag(FFlag.INFPOWER, true);
 		faction.setFlag(FFlag.POWERLOSS, true);
 		faction.setFlag(FFlag.PVP, true);