Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-11-30 06:03:59 +01:00
Code Issues Projects Releases Wiki Activity

Leaders can now not be kicked by their officers. Improved leader command.

Browse Source
This commit is contained in:
Olof Larsson 2011-12-23 01:13:55 +01:00
parent 3dc70e82d9
commit 81d24ecbc4
3 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin.yml
View File

@ -102,7 +102,7 @@ permissions:
factions.kick: factions.kick:
description: kick a player from the faction description: kick a player from the faction
factions.leader: factions.leader:
description: hand over your leader rights description: hand over leader rights
factions.leave: factions.leave:
description: leave your faction description: leave your faction
factions.list: factions.list:

6
src/com/massivecraft/factions/cmd/CmdKick.java
View File

@ -41,6 +41,12 @@ public class CmdKick extends FCommand
return; return;
} }
if (you.getRole() == Rel.LEADER && !(this.senderIsConsole || fme.hasAdminMode()))
{
msg("<b>The leader can not be kicked.");
return;
}
if ( ! Conf.canLeaveWithNegativePower && you.getPower() < 0) if ( ! Conf.canLeaveWithNegativePower && you.getPower() < 0)
{ {
msg("<b>You cannot kick that member until their power is positive."); msg("<b>You cannot kick that member until their power is positive.");

50
src/com/massivecraft/factions/cmd/CmdLeader.java
View File

@ -2,8 +2,10 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers; import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Rel; import com.massivecraft.factions.struct.Rel;
import com.massivecraft.factions.util.RelationUtil;
public class CmdLeader extends FCommand public class CmdLeader extends FCommand
{ {
@ -13,43 +15,67 @@ public class CmdLeader extends FCommand
this.aliases.add("leader"); this.aliases.add("leader");
this.requiredArgs.add("player"); this.requiredArgs.add("player");
//this.optionalArgs.put("", ""); this.optionalArgs.put("faction", "your");
this.permission = Permission.LEADER.node; this.permission = Permission.LEADER.node;
this.disableOnLock = true; this.disableOnLock = true;
senderMustBePlayer = true; senderMustBePlayer = false;
senderMustBeMember = false; senderMustBeMember = false;
senderMustBeOfficer = false; senderMustBeOfficer = false;
senderMustBeLeader = true; senderMustBeLeader = false;
} }
@Override @Override
public void perform() public void perform()
{ {
FPlayer fyou = this.argAsBestFPlayerMatch(0); FPlayer newLeader = this.argAsBestFPlayerMatch(0);
if (fyou == null) return; if (newLeader == null) return;
if (fyou.getFaction() != myFaction) Faction targetFaction = this.argAsFaction(1, myFaction);
if (targetFaction == null) return;
FPlayer targetFactionCurrentLeader = targetFaction.getFPlayerLeader();
// We now have fplayer and the target faction
if (this.senderIsConsole || fme.hasAdminMode())
{ {
msg("%s<i> is not a member in your faction.", fyou.describeTo(fme, true)); // Do whatever you wish
}
else
{
// Follow the standard rules
if (fme.getRole() != Rel.LEADER)
{
sender.sendMessage(p.txt.parse("<b>Only faction admins can %s.", this.getHelpShort()));
return; return;
} }
if (fyou == fme) if (newLeader.getFaction() != myFaction)
{
msg("%s<i> is not a member in your faction.", newLeader.describeTo(fme, true));
return;
}
if (newLeader == fme)
{ {
msg("<b>The target player musn't be yourself."); msg("<b>The target player musn't be yourself.");
return; return;
} }
}
fme.setRole(Rel.OFFICER); // Perform the switching
fyou.setRole(Rel.LEADER); if (targetFactionCurrentLeader != null)
{
targetFactionCurrentLeader.setRole(Rel.OFFICER);
}
newLeader.setFaction(targetFaction);
newLeader.setRole(Rel.LEADER);
// Inform all players // Inform all players
for (FPlayer fplayer : FPlayers.i.getOnline()) for (FPlayer fplayer : FPlayers.i.getOnline())
{ {
fplayer.msg("%s<i> gave %s<i> the leadership of %s", fme.describeTo(fplayer, true), fyou.describeTo(fplayer), myFaction.describeTo(fplayer)); fplayer.msg("%s<i> gave %s<i> the leadership of %s", RelationUtil.describeThatToMe(fme, fplayer, true), newLeader.describeTo(fplayer), targetFaction.describeTo(fplayer));
} }
} }
} }