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)
This commit is contained in:
parent
1a109fa589
commit
589e4417c7
@ -45,7 +45,7 @@ public class CmdLeader extends FCommand
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Follow the standard rules
|
// 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()));
|
sender.sendMessage(p.txt.parse("<b>Only faction leaders can %s.", this.getHelpShort()));
|
||||||
return;
|
return;
|
||||||
@ -53,7 +53,7 @@ public class CmdLeader extends FCommand
|
|||||||
|
|
||||||
if (newLeader.getFaction() != myFaction)
|
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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user