Woop

2011-10-23 22:08:57 +02:00
parent ac6870b770
commit 21783ef9d4
24 changed files with 149 additions and 712 deletions
--- a/src/com/massivecraft/factions/cmd/CmdShow.java
+++ b/src/com/massivecraft/factions/cmd/CmdShow.java
@ -56,9 +56,9 @@ public class CmdShow extends FCommand
 		}
 		
 		String peaceStatus = "";
-		if (faction.isPeaceful())
+		if (faction.getFlag(FactionFlag.PEACEFUL))
 		{
-			peaceStatus = "     "+Conf.colorNeutral+"This faction is Peaceful";
+			peaceStatus = "     "+Conf.colorTruce+"This faction is Peaceful";
 		}
 		
 		msg("<a>Joining: <i>"+(faction.getOpen() ? "no invitation is needed" : "invitation is required")+peaceStatus);