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

0.5h - TypeNullable does not work well with TypeContainer.

Browse Source
This commit is contained in:
ulumulu1510 2016-02-26 15:13:29 +01:00 committed by Olof Larsson
parent 47332f96d5
commit 08024bd4f9
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,6 @@ import com.massivecraft.massivecore.collections.MassiveList;
import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.collections.MassiveSet;
import com.massivecraft.massivecore.command.Parameter; import com.massivecraft.massivecore.command.Parameter;
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
import com.massivecraft.massivecore.command.type.TypeNullable;
import com.massivecraft.massivecore.command.type.container.TypeSet; import com.massivecraft.massivecore.command.type.container.TypeSet;
import com.massivecraft.massivecore.pager.Pager; import com.massivecraft.massivecore.pager.Pager;
import com.massivecraft.massivecore.pager.Stringifier; import com.massivecraft.massivecore.pager.Stringifier;
@ -47,7 +46,7 @@ public class CmdFactionsRelationList extends FactionsCommand
// Parameter // Parameter
this.addParameter(Parameter.getPage()); this.addParameter(Parameter.getPage());
this.addParameter(TypeFaction.get(), "faction", "you"); this.addParameter(TypeFaction.get(), "faction", "you");
this.addParameter(TypeNullable.get(TypeSet.get(TypeRelation.get()), "all"), "relation|all", "all"); this.addParameter(TypeSet.get(TypeRelation.get()), "relations", "all");
// Requirements // Requirements
this.addRequirements(RequirementHasPerm.get(Perm.RELATION_LIST.node)); this.addRequirements(RequirementHasPerm.get(Perm.RELATION_LIST.node));
@ -64,8 +63,7 @@ public class CmdFactionsRelationList extends FactionsCommand
// Args // Args
int page = this.readArg(); int page = this.readArg();
final Faction faction = this.readArg(msenderFaction); final Faction faction = this.readArg(msenderFaction);
final Set<Rel> rel = this.readArg(); final Set<Rel> relations = this.readArg(RELEVANT_RELATIONS);
final Set<Rel> relations = rel == null ? RELEVANT_RELATIONS : rel;
// Pager Create // Pager Create
final Pager<String> pager = new Pager<String>(this, "", page, new Stringifier<String>() final Pager<String> pager = new Pager<String>(this, "", page, new Stringifier<String>()

2
src/com/massivecraft/factions/cmd/CmdFactionsRelationWishes.java
View File

@ -38,7 +38,7 @@ public class CmdFactionsRelationWishes extends FactionsCommand
this.addParameter(TypeFaction.get(), "faction", "you"); this.addParameter(TypeFaction.get(), "faction", "you");
// Requirements // Requirements
this.addRequirements(RequirementHasPerm.get(Perm.RELATION_LIST.node)); this.addRequirements(RequirementHasPerm.get(Perm.RELATION_WISHES.node));
this.addRequirements(ReqHasFaction.get()); this.addRequirements(ReqHasFaction.get());
} }