From 6bf9d29bed5e7b25004708fadfc8b58288c6faf0 Mon Sep 17 00:00:00 2001 From: Magnus Ulf Date: Tue, 18 Dec 2018 15:40:07 +0100 Subject: [PATCH] Remove Status perm --- src/com/massivecraft/factions/cmd/CmdFactionsStatus.java | 6 +----- src/com/massivecraft/factions/entity/MPerm.java | 5 ----- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsStatus.java b/src/com/massivecraft/factions/cmd/CmdFactionsStatus.java index 405b4c04..037198c7 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsStatus.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsStatus.java @@ -1,10 +1,9 @@ package com.massivecraft.factions.cmd; -import com.massivecraft.factions.comparator.ComparatorMPlayerInactivity; import com.massivecraft.factions.cmd.type.TypeFaction; import com.massivecraft.factions.cmd.type.TypeSortMPlayer; +import com.massivecraft.factions.comparator.ComparatorMPlayerInactivity; import com.massivecraft.factions.entity.Faction; -import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.command.Parameter; @@ -44,9 +43,6 @@ public class CmdFactionsStatus extends FactionsCommand int page = this.readArg(); Faction faction = this.readArg(msenderFaction); Comparator sortedBy = this.readArg(ComparatorMPlayerInactivity.get()); - - // MPerm - if ( ! MPerm.getPermStatus().has(msender, faction, true)) return; // Sort list final List mplayers = faction.getMPlayers(); diff --git a/src/com/massivecraft/factions/entity/MPerm.java b/src/com/massivecraft/factions/entity/MPerm.java index b42c5256..c03e2304 100644 --- a/src/com/massivecraft/factions/entity/MPerm.java +++ b/src/com/massivecraft/factions/entity/MPerm.java @@ -19,7 +19,6 @@ import com.massivecraft.massivecore.util.Txt; import org.bukkit.entity.Player; import java.util.ArrayList; -import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -53,7 +52,6 @@ public class MPerm extends Entity implements Prioritized, Registerable, N public final static transient String ID_DISBAND = "disband"; public final static transient String ID_FLAGS = "flags"; public final static transient String ID_PERMS = "perms"; - public final static transient String ID_STATUS = "status"; public final static transient int PRIORITY_BUILD = 1000; public final static transient int PRIORITY_PAINBUILD = 2000; @@ -79,7 +77,6 @@ public class MPerm extends Entity implements Prioritized, Registerable, N public final static transient int PRIORITY_DISBAND = 21000; public final static transient int PRIORITY_FLAGS = 22000; public final static transient int PRIORITY_PERMS = 23000; - public final static transient int PRIORITY_STATUS = 24000; // -------------------------------------------- // // META: CORE @@ -119,7 +116,6 @@ public class MPerm extends Entity implements Prioritized, Registerable, N getPermKick(); getPermTitle(); getPermHome(); - getPermStatus(); getPermSethome(); getPermDeposit(); getPermWithdraw(); @@ -143,7 +139,6 @@ public class MPerm extends Entity implements Prioritized, Registerable, N public static MPerm getPermDesc() { return getCreative(PRIORITY_DESC, ID_DESC, ID_DESC, "set description", MUtil.set(Rel.LEADER, Rel.OFFICER), false, true, true); } public static MPerm getPermMotd() { return getCreative(PRIORITY_MOTD, ID_MOTD, ID_MOTD, "set motd", MUtil.set(Rel.LEADER, Rel.OFFICER), false, true, true); } public static MPerm getPermInvite() { return getCreative(PRIORITY_INVITE, ID_INVITE, ID_INVITE, "invite players", MUtil.set(Rel.LEADER, Rel.OFFICER), false, true, true); } - public static MPerm getPermStatus() { return getCreative(PRIORITY_STATUS, ID_STATUS, ID_STATUS, "show status", MUtil.set(Rel.LEADER, Rel.OFFICER), false, true, true); } public static MPerm getPermKick() { return getCreative(PRIORITY_KICK, ID_KICK, ID_KICK, "kick members", MUtil.set(Rel.LEADER, Rel.OFFICER), false, true, true); } public static MPerm getPermTitle() { return getCreative(PRIORITY_TITLE, ID_TITLE, ID_TITLE, "set titles", MUtil.set(Rel.LEADER, Rel.OFFICER), false, true, true); } public static MPerm getPermHome() { return getCreative(PRIORITY_HOME, ID_HOME, ID_HOME, "teleport home", MUtil.set(Rel.LEADER, Rel.OFFICER, Rel.MEMBER, Rel.RECRUIT, Rel.ALLY), false, true, true); }