From e3284a5ee1577e4f9a26e0b22a686741db61c896 Mon Sep 17 00:00:00 2001
From: Brettflan <dsr@fenrisoft.com>
Date: Sun, 16 Oct 2011 09:11:29 -0500
Subject: [PATCH] Fix for /f money command not being shown in help, and some
 other minor cleanup

---
 plugin.yml                                          | 2 +-
 src/com/massivecraft/factions/cmd/CmdHelp.java      | 5 +++--
 src/com/massivecraft/factions/cmd/FCommand.java     | 4 ++--
 src/com/massivecraft/factions/integration/Econ.java | 5 ++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugin.yml b/plugin.yml
index 1a2d9f80..3f317c7e 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -1,5 +1,5 @@
 name: Factions
-version: 1.6.0_dev
+version: 1.5.9_beta
 main: com.massivecraft.factions.P
 authors: [Olof Larsson, Brett Flannigan]
 softdepend: [PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, nChat, ChatManager, CAPI, AuthMe, Register, Spout, WorldEdit, WorldGuard]
diff --git a/src/com/massivecraft/factions/cmd/CmdHelp.java b/src/com/massivecraft/factions/cmd/CmdHelp.java
index 0f334a73..a688c6ba 100644
--- a/src/com/massivecraft/factions/cmd/CmdHelp.java
+++ b/src/com/massivecraft/factions/cmd/CmdHelp.java
@@ -2,6 +2,7 @@ package com.massivecraft.factions.cmd;
 
 import java.util.ArrayList;
 
+import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.P;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.struct.Permission;
@@ -83,13 +84,13 @@ public class CmdHelp extends FCommand
 		pageLines.add( p.cmdBase.cmdSethome.getUseageTemplate(true) );
 		helpPages.add(pageLines);
 		
-		if (Econ.shouldBeUsed())
+		if (Econ.isSetup() && Conf.bankEnabled)
 		{
 			pageLines = new ArrayList<String>();
 			pageLines.add( "" );
 			pageLines.add( p.txt.parse("<i>Your faction has a bank which is used to pay for certain" ));
 			pageLines.add( p.txt.parse("<i>things, so it will need to have money deposited into it." ));
-			pageLines.add( p.txt.parse("<i>To lear more use the money command." ));
+			pageLines.add( p.txt.parse("<i>To learn more, use the money command." ));
 			pageLines.add( "" );
 			pageLines.add( p.cmdBase.cmdMoney.getUseageTemplate(true) );
 			pageLines.add( "" );
diff --git a/src/com/massivecraft/factions/cmd/FCommand.java b/src/com/massivecraft/factions/cmd/FCommand.java
index 7d0514c5..48462f91 100644
--- a/src/com/massivecraft/factions/cmd/FCommand.java
+++ b/src/com/massivecraft/factions/cmd/FCommand.java
@@ -70,13 +70,13 @@ public abstract class FCommand extends MCommand<P>
 		
 		if (this.isMoneyCommand && ! Conf.econEnabled)
 		{
-			msg("<b>Faction economy features are diabled on this server.");
+			msg("<b>Faction economy features are disabled on this server.");
 			return false;
 		}
 		
 		if (this.isMoneyCommand && ! Conf.bankEnabled)
 		{
-			msg("<b>The faction bank system is diabled on this server.");
+			msg("<b>The faction bank system is disabled on this server.");
 			return false;
 		}
 		
diff --git a/src/com/massivecraft/factions/integration/Econ.java b/src/com/massivecraft/factions/integration/Econ.java
index 18bf2e64..09a70b1d 100644
--- a/src/com/massivecraft/factions/integration/Econ.java
+++ b/src/com/massivecraft/factions/integration/Econ.java
@@ -50,11 +50,10 @@ public class Econ
 		{
 			register = (Register)plug;
 				
-			P.p.log("Economy integration through register successful.");
+			P.p.log("Economy integration through Register plugin successful.");
+
 			if ( ! Conf.econEnabled)
-			{
 				P.p.log("NOTE: Economy is disabled. Enable in conf \"econEnabled\": true");
-			}
 		}
 		else
 		{