From fbbf0a12af0cb646168da4e6638104e26afded1c Mon Sep 17 00:00:00 2001
From: Brettflan <dsr@fenrisoft.com>
Date: Tue, 7 Feb 2012 15:31:35 -0600
Subject: [PATCH] Add back support for older EssentialsChat versions

also reword leader command's "you must be leader" error message
---
 src/com/massivecraft/factions/P.java                       | 7 +++----
 src/com/massivecraft/factions/cmd/CmdLeader.java           | 2 +-
 ...FeaturesTODO.java => EssentialsOldVersionFeatures.java} | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)
 rename src/com/massivecraft/factions/integration/{EssentialsOldVersionFeaturesTODO.java => EssentialsOldVersionFeatures.java} (97%)

diff --git a/src/com/massivecraft/factions/P.java b/src/com/massivecraft/factions/P.java
index f653a3bc..434ced79 100644
--- a/src/com/massivecraft/factions/P.java
+++ b/src/com/massivecraft/factions/P.java
@@ -24,6 +24,7 @@ import com.massivecraft.factions.cmd.*;
 import com.massivecraft.factions.integration.capi.CapiFeatures;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.integration.EssentialsFeatures;
+import com.massivecraft.factions.integration.EssentialsOldVersionFeatures;
 import com.massivecraft.factions.integration.LWCFeatures;
 import com.massivecraft.factions.integration.SpoutFeatures;
 import com.massivecraft.factions.integration.Worldguard;
@@ -194,8 +195,7 @@ public class P extends MPlugin
 				// no? try older Essentials 2.x integration method
 				try
 				{
-					// TODO: Creates errors in eclipse
-					//EssentialsOldVersionFeatures.integrateChat(essChat);
+					EssentialsOldVersionFeatures.integrateChat(essChat);
 				}
 				catch (NoClassDefFoundError ex2)
 				{
@@ -211,8 +211,7 @@ public class P extends MPlugin
 		{
 			try
 			{
-				// TODO: Creates errors in eclipse
-				//EssentialsOldVersionFeatures.unhookChat();
+				EssentialsOldVersionFeatures.unhookChat();
 			}
 			catch (NoClassDefFoundError ex)
 			{
diff --git a/src/com/massivecraft/factions/cmd/CmdLeader.java b/src/com/massivecraft/factions/cmd/CmdLeader.java
index 7434416b..7203907f 100644
--- a/src/com/massivecraft/factions/cmd/CmdLeader.java
+++ b/src/com/massivecraft/factions/cmd/CmdLeader.java
@@ -47,7 +47,7 @@ public class CmdLeader extends FCommand
 			// Follow the standard rules
 			if (fme.getRole() != Rel.LEADER || targetFaction != myFaction)
 			{
-				sender.sendMessage(p.txt.parse("<b>Only faction leaders can %s.", this.getHelpShort()));
+				sender.sendMessage(p.txt.parse("<b>You must be leader of the faction to %s.", this.getHelpShort()));
 				return;
 			}
 			
diff --git a/src/com/massivecraft/factions/integration/EssentialsOldVersionFeaturesTODO.java b/src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java
similarity index 97%
rename from src/com/massivecraft/factions/integration/EssentialsOldVersionFeaturesTODO.java
rename to src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java
index 86178846..e867820a 100644
--- a/src/com/massivecraft/factions/integration/EssentialsOldVersionFeaturesTODO.java
+++ b/src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java
@@ -14,7 +14,7 @@ import com.earth2me.essentials.chat.IEssentialsChatListener;
  * This Essentials integration handler is for older 2.x.x versions of Essentials which have "IEssentialsChatListener"
  */
 
-public class EssentialsOldVersionFeaturesTODO
+public class EssentialsOldVersionFeatures
 {
 	private static EssentialsChat essChat;