From 958a1e0d9fd2b4188174befef6e7556d6fcc2c58 Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Sun, 23 Oct 2011 23:38:26 +0200
Subject: [PATCH] Working permdelta parser

---
 src/com/massivecraft/factions/Faction.java            | 1 +
 src/com/massivecraft/factions/cmd/CmdDescription.java | 2 +-
 src/com/massivecraft/factions/cmd/CmdPerm.java        | 2 +-
 src/com/massivecraft/factions/struct/FactionFlag.java | 2 +-
 src/com/massivecraft/factions/struct/FactionPerm.java | 6 +++---
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/com/massivecraft/factions/Faction.java b/src/com/massivecraft/factions/Faction.java
index c109adac..f241109e 100644
--- a/src/com/massivecraft/factions/Faction.java
+++ b/src/com/massivecraft/factions/Faction.java
@@ -165,6 +165,7 @@ public class Faction extends Entity implements EconomyParticipator
 		//this.peacefulExplosionsEnabled = false;
 		this.money = 0.0;
 		this.flagOverrides = new LinkedHashMap<FactionFlag, Boolean>();
+		this.permOverrides = new LinkedHashMap<FactionPerm, Set<Rel>>();
 	}
 	
 
diff --git a/src/com/massivecraft/factions/cmd/CmdDescription.java b/src/com/massivecraft/factions/cmd/CmdDescription.java
index 9b7015f6..63856f30 100644
--- a/src/com/massivecraft/factions/cmd/CmdDescription.java
+++ b/src/com/massivecraft/factions/cmd/CmdDescription.java
@@ -37,7 +37,7 @@ public class CmdDescription extends FCommand
 		// Broadcast the description to everyone
 		for (FPlayer fplayer : FPlayers.i.getOnline())
 		{
-			fplayer.msg("<i>The faction %s<i> changed their description to:", myFaction.describeTo(fplayer));
+			fplayer.msg("<h>%s<i> changed their description to:", myFaction.describeTo(fplayer));
 			fplayer.msg("<h>"+myFaction.getDescription());
 		}
 	}
diff --git a/src/com/massivecraft/factions/cmd/CmdPerm.java b/src/com/massivecraft/factions/cmd/CmdPerm.java
index c6d06743..b56a4cc6 100644
--- a/src/com/massivecraft/factions/cmd/CmdPerm.java
+++ b/src/com/massivecraft/factions/cmd/CmdPerm.java
@@ -62,7 +62,7 @@ public class CmdPerm extends FCommand
 		}
 		
 		// TODO: Awesomesause parser for deltas...
-		Set<Rel> targetValue = FactionPerm.parseRelDeltas(TextUtil.implode(args.subList(2, args.size()-1), " "), faction.getPerm(perm));
+		Set<Rel> targetValue = FactionPerm.parseRelDeltas(TextUtil.implode(args.subList(2, args.size()), " "), faction.getPerm(perm));
 
 		// Do the sender have the right to change perms for this faction?
 		if (Permission.PERM_ANY.has(sender))
diff --git a/src/com/massivecraft/factions/struct/FactionFlag.java b/src/com/massivecraft/factions/struct/FactionFlag.java
index 4bf59a77..07181d49 100644
--- a/src/com/massivecraft/factions/struct/FactionFlag.java
+++ b/src/com/massivecraft/factions/struct/FactionFlag.java
@@ -91,7 +91,7 @@ public enum FactionFlag
 	
 	public String getStateInfo(boolean value, boolean withDesc)
 	{
-		String ret = (value ? "<g>YES" : "<b>NOT") + "<h> " + this.getNicename();
+		String ret = (value ? "<g>YES" : "<b>NOO") + "<h> " + this.getNicename();
 		if (withDesc)
 		{
 			ret += " " + this.getDescription();
diff --git a/src/com/massivecraft/factions/struct/FactionPerm.java b/src/com/massivecraft/factions/struct/FactionPerm.java
index 7dfe75ec..38111385 100644
--- a/src/com/massivecraft/factions/struct/FactionPerm.java
+++ b/src/com/massivecraft/factions/struct/FactionPerm.java
@@ -71,13 +71,13 @@ public enum FactionPerm
 		List<String> rels = new ArrayList<String>();
 		for (Rel rel : value)
 		{
-			rels.add("<i>"+rel.nicename);
+			rels.add("<p>"+rel.nicename);
 		}
-		ret += TextUtil.implode(rels, "<n> ,");
+		ret += TextUtil.implode(rels, "<c> + ");
 		
 		if (withDesc)
 		{
-			ret += " " + this.getDescription();
+			ret += " <i>" + this.getDescription();
 		}
 		return ret;
 	}