Even more command fixes.

This commit is contained in:
Olof Larsson
2013-04-16 11:05:49 +02:00
parent a84582ba21
commit e874ea60df
31 changed files with 216 additions and 158 deletions

View File

@@ -7,6 +7,8 @@ import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.cmd.arg.ARFPlayer;
import com.massivecraft.factions.cmd.arg.ARFaction;
import com.massivecraft.factions.event.FPlayerJoinEvent;
import com.massivecraft.factions.util.RelationUtil;
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
@@ -27,10 +29,10 @@ public class CmdFactionsLeader extends FCommand
@Override
public void perform()
{
FPlayer newLeader = this.argAsBestFPlayerMatch(0);
FPlayer newLeader = this.arg(0, ARFPlayer.getStartAny());
if (newLeader == null) return;
Faction targetFaction = this.argAsFaction(1, myFaction);
Faction targetFaction = this.arg(1, ARFaction.get(), myFaction);
if (targetFaction == null) return;
FPlayer targetFactionCurrentLeader = targetFaction.getFPlayerLeader();