From 684974b33637ca0bc37584a7390ab4eada99b3dc Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Thu, 25 Apr 2013 20:21:23 +0200
Subject: [PATCH] Minor tweaks to default config values

---
 .../massivecraft/factions/entity/Faction.java |  4 ++-
 .../massivecraft/factions/entity/UConf.java   | 26 ++++++++++++++++---
 .../integration/herochat/AlliesChannel.java   |  2 +-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/com/massivecraft/factions/entity/Faction.java b/src/com/massivecraft/factions/entity/Faction.java
index 8e9d5b69..72fb88b0 100644
--- a/src/com/massivecraft/factions/entity/Faction.java
+++ b/src/com/massivecraft/factions/entity/Faction.java
@@ -916,11 +916,13 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
 		}
 
 		if (replacements == null || replacements.isEmpty())
-		{	// faction leader is the only member; one-man faction
+		{
+			// faction leader is the only member; one-man faction
 			if (this.getFlag(FFlag.PERMANENT))
 			{
 				if (oldLeader != null)
 				{
+					// TODO: Where is the logic in this? Why MEMBER? Why not LEADER again? And why not OFFICER or RECRUIT?
 					oldLeader.setRole(Rel.MEMBER);
 				}
 				return;
diff --git a/src/com/massivecraft/factions/entity/UConf.java b/src/com/massivecraft/factions/entity/UConf.java
index 0f7c12d7..a0c5dbca 100644
--- a/src/com/massivecraft/factions/entity/UConf.java
+++ b/src/com/massivecraft/factions/entity/UConf.java
@@ -98,7 +98,7 @@ public class UConf extends Entity<UConf>
 	// -------------------------------------------- //
 
 	public int factionMemberLimit = 0;
-	public double factionPowerMax = 1000.0;
+	public double factionPowerMax = 0.0;
 	
 	public int factionNameLengthMin = 3;
 	public int factionNameLengthMax = 16;
@@ -108,7 +108,7 @@ public class UConf extends Entity<UConf>
 	// CLAIMS
 	// -------------------------------------------- //
 	
-	public boolean claimsMustBeConnected = false;
+	public boolean claimsMustBeConnected = true;
 	public boolean claimingFromOthersAllowed = true;
 	public boolean claimsCanBeUnconnectedIfOwnedByOtherFaction = true;
 	public int claimsRequireMinFactionMembers = 1;
@@ -145,7 +145,25 @@ public class UConf extends Entity<UConf>
 
 	// commands which will be prevented when in claimed territory of another faction
 	public Map<Rel, List<String>> denyCommandsTerritoryRelation = MUtil.map(
-		Rel.ENEMY, MUtil.list("home", "sethome", "spawn", "tpahere", "tpaccept", "tpa", "warp"),
+		Rel.ENEMY, MUtil.list(
+			"home",
+			"sethome",
+			"tpahere",
+			"tpaccept",
+			"tpa",
+			"warp",
+			"warps",
+			"spawn",
+			"wtp",
+			"uspawn",
+			"utp",
+			"mspawn",
+			"mtp",
+			"fspawn",
+			"ftp",
+			"jspawn",
+			"jtp"
+		),
 		Rel.NEUTRAL, new ArrayList<String>(),
 		Rel.TRUCE, new ArrayList<String>(),
 		Rel.ALLY, new ArrayList<String>(),
@@ -181,7 +199,7 @@ public class UConf extends Entity<UConf>
 		FactionsEventChunkChangeType.PILLAGE, -10.0
 	);
 	
-	public double econCostCreate = 100.0;
+	public double econCostCreate = 200.0;
 	public double econCostSethome = 0.0;
 	public double econCostJoin = 0.0;
 	public double econCostLeave = 0.0;
diff --git a/src/com/massivecraft/factions/integration/herochat/AlliesChannel.java b/src/com/massivecraft/factions/integration/herochat/AlliesChannel.java
index a5ef80e3..03b0820a 100644
--- a/src/com/massivecraft/factions/integration/herochat/AlliesChannel.java
+++ b/src/com/massivecraft/factions/integration/herochat/AlliesChannel.java
@@ -10,7 +10,7 @@ import com.massivecraft.factions.entity.MConf;
 
 public class AlliesChannel extends FactionsChannelAbstract
 {
-	public static final Set<Rel> targetRelations = EnumSet.of(Rel.MEMBER, Rel.ALLY);
+	public static final Set<Rel> targetRelations = EnumSet.of(Rel.MEMBER, Rel.RECRUIT, Rel.ALLY);
 	@Override public Set<Rel> getTargetRelations() { return targetRelations; }
 	
 	@Override public String getName() { return MConf.get().herochatAlliesName; }