Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added optional faction tag entry to /f sethome command to set the home of any faction, which is only allowed if the user has adminBypass permission

Browse Source
This commit is contained in:
Brettflan 2011-07-20 15:42:51 -05:00
parent 0b8a33e44a
commit 66bc427454
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/massivecraft/factions/commands/FCommandSethome.java
View File

@ -2,6 +2,7 @@ package com.massivecraft.factions.commands;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Faction; import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
public class FCommandSethome extends FBaseCommand { public class FCommandSethome extends FBaseCommand {
@ -9,6 +10,8 @@ public class FCommandSethome extends FBaseCommand {
public FCommandSethome() { public FCommandSethome() {
aliases.add("sethome"); aliases.add("sethome");
optionalParameters.add("faction tag");
helpDescription = "Set the faction home"; helpDescription = "Set the faction home";
} }
@ -32,16 +35,34 @@ public class FCommandSethome extends FBaseCommand {
return; return;
} }
if (Conf.homesMustBeInClaimedTerritory && !me.isInOwnTerritory()) { Faction myFaction = me.getFaction();
if (parameters.size() > 0) {
if (!Factions.hasPermAdminBypass(player)) {
me.sendMessage("You cannot set the home of another faction without adminBypass permission.");
return;
}
myFaction = findFaction(parameters.get(0), true);
if (myFaction == null) {
me.sendMessage("No such faction seems to exist.");
return;
}
}
if (Conf.homesMustBeInClaimedTerritory && !me.isInOwnTerritory() && !Factions.hasPermAdminBypass(player)) {
me.sendMessage("Sorry, your faction home can only be set inside your own claimed territory."); me.sendMessage("Sorry, your faction home can only be set inside your own claimed territory.");
return; return;
} }
Faction myFaction = me.getFaction();
myFaction.setHome(player.getLocation()); myFaction.setHome(player.getLocation());
myFaction.sendMessage(me.getNameAndRelevant(myFaction)+Conf.colorSystem+" set the home for your faction. You can now use:"); myFaction.sendMessage(me.getNameAndRelevant(myFaction)+Conf.colorSystem+" set the home for your faction. You can now use:");
myFaction.sendMessage(new FCommandHome().getUseageTemplate()); myFaction.sendMessage(new FCommandHome().getUseageTemplate());
if (myFaction != me.getFaction()) {
me.sendMessage("You have set the home for the "+myFaction.getTag(me)+Conf.colorSystem+" faction.");
}
} }
} }