EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Even more command fixes.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/massivecraft/factions/cmd/CmdFactionsPerm.java
View File

@ -4,6 +4,7 @@ import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.cmd.arg.ARFaction;
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
import com.massivecraft.mcore.util.Txt;
@ -13,7 +14,7 @@ public class CmdFactionsPerm extends FCommand
{
this.addAliases("perm");
this.addOptionalArg("faction", "your");
this.addOptionalArg("faction", "you");
this.addOptionalArg("perm", "all");
this.addOptionalArg("relation", "read");
this.addOptionalArg("yes/no", "read");
@ -25,11 +26,7 @@ public class CmdFactionsPerm extends FCommand
@Override
public void perform()
{
Faction faction = myFaction;
if (this.argIsSet(0))
{
faction = this.argAsFaction(0);
}
Faction faction = this.arg(0, ARFaction.get(), myFaction);
if (faction == null) return;
if ( ! this.argIsSet(1))