From 589e4417c7a29a81ed8d93fcc2a6cc4f7204ec4b Mon Sep 17 00:00:00 2001
From: Brettflan <dsr@fenrisoft.com>
Date: Tue, 7 Feb 2012 15:15:25 -0600
Subject: [PATCH] Major bugfix: leaders of factions should no longer be able to
 promote members of other factions to leader of that faction (unless of course
 they have factions.leader.any permission)

---
 src/com/massivecraft/factions/cmd/CmdLeader.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/massivecraft/factions/cmd/CmdLeader.java b/src/com/massivecraft/factions/cmd/CmdLeader.java
index e370fbf3..96781315 100644
--- a/src/com/massivecraft/factions/cmd/CmdLeader.java
+++ b/src/com/massivecraft/factions/cmd/CmdLeader.java
@@ -45,7 +45,7 @@ public class CmdLeader extends FCommand
 		else
 		{
 			// Follow the standard rules
-			if (fme.getRole() != Rel.LEADER)
+			if (fme.getRole() != Rel.LEADER || fme.getFaction() != myFaction)
 			{
 				sender.sendMessage(p.txt.parse("<b>Only faction leaders can %s.", this.getHelpShort()));
 				return;
@@ -53,7 +53,7 @@ public class CmdLeader extends FCommand
 			
 			if (newLeader.getFaction() != myFaction)
 			{
-				msg("%s<i> is not a member in your faction.", newLeader.describeTo(fme, true));
+				msg("%s<i> is not a member in the faction.", newLeader.describeTo(fme, true));
 				return;
 			}