From 08024bd4f95458d8eed79e9d5f36b122473fbcaf Mon Sep 17 00:00:00 2001 From: ulumulu1510 Date: Fri, 26 Feb 2016 15:13:29 +0100 Subject: [PATCH] 0.5h - TypeNullable does not work well with TypeContainer. --- .../massivecraft/factions/cmd/CmdFactionsRelationList.java | 6 ++---- .../factions/cmd/CmdFactionsRelationWishes.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsRelationList.java b/src/com/massivecraft/factions/cmd/CmdFactionsRelationList.java index 66fc043f..a5eec8b8 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsRelationList.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsRelationList.java @@ -20,7 +20,6 @@ import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.command.Parameter; 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.pager.Pager; import com.massivecraft.massivecore.pager.Stringifier; @@ -47,7 +46,7 @@ public class CmdFactionsRelationList extends FactionsCommand // Parameter this.addParameter(Parameter.getPage()); 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 this.addRequirements(RequirementHasPerm.get(Perm.RELATION_LIST.node)); @@ -64,8 +63,7 @@ public class CmdFactionsRelationList extends FactionsCommand // Args int page = this.readArg(); final Faction faction = this.readArg(msenderFaction); - final Set rel = this.readArg(); - final Set relations = rel == null ? RELEVANT_RELATIONS : rel; + final Set relations = this.readArg(RELEVANT_RELATIONS); // Pager Create final Pager pager = new Pager(this, "", page, new Stringifier() diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsRelationWishes.java b/src/com/massivecraft/factions/cmd/CmdFactionsRelationWishes.java index ba7e3640..8c446618 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsRelationWishes.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsRelationWishes.java @@ -38,7 +38,7 @@ public class CmdFactionsRelationWishes extends FactionsCommand this.addParameter(TypeFaction.get(), "faction", "you"); // Requirements - this.addRequirements(RequirementHasPerm.get(Perm.RELATION_LIST.node)); + this.addRequirements(RequirementHasPerm.get(Perm.RELATION_WISHES.node)); this.addRequirements(ReqHasFaction.get()); }