From 2bfe2bdc757b8eb7cacf6ca6094be14e3bc4dc94 Mon Sep 17 00:00:00 2001 From: Magnus Ulf Date: Sat, 29 Dec 2018 19:24:56 +0100 Subject: [PATCH] Slight changes to f perm show show and show2 is not ideal, a solution must be found. Probably renaming one or both commens to use different synonoyms --- plugin.yml | 5 ++++- src/com/massivecraft/factions/cmd/CmdFactionsPermShow.java | 2 +- src/com/massivecraft/factions/cmd/type/TypeMPermable.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plugin.yml b/plugin.yml index f0816ff0..99fffec6 100644 --- a/plugin.yml +++ b/plugin.yml @@ -63,7 +63,8 @@ permissions: factions.perm: {description: change faction permissions, default: false} factions.perm.list: {description: list perms, default: false} factions.perm.set: {description: set perms, default: false} - factions.perm.show: {description: show perms, default: false} + factions.perm.show: {description: show who has perm, default: false} + factions.perm.show2: {description: show perms given to, default: false} factions.player: {description: show player information} factions.powerboost: {description: manage powerboost, default: false} factions.powerboost.faction: {description: show faction powerboost, default: false} @@ -162,6 +163,7 @@ permissions: factions.perm.list: true factions.perm.set: true factions.perm.show: true + factions.perm.show2: true factions.player: true factions.powerboost: true factions.powerboost.faction: true @@ -283,6 +285,7 @@ permissions: factions.perm.list: true factions.perm.set: true factions.perm.show: true + factions.perm.show2: true factions.player: true factions.promote: true factions.powerboost: true diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPermShow.java b/src/com/massivecraft/factions/cmd/CmdFactionsPermShow.java index 9bcf784b..ecb9ebaa 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPermShow.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPermShow.java @@ -55,7 +55,7 @@ public class CmdFactionsPermShow extends FactionsCommand String permableNames = Txt.implodeCommaAnd(permableList, Txt.parse("")); // Create messages - msg("In %s permission %s is granted to %s.", faction.describeTo(msender), mperm.getName(), permableNames); + msg("In %s permission %s is granted to %s.", faction.describeTo(msender), mperm.getDesc(true, false), permableNames); } public static MPerm.MPermable idToMPermable(String id) diff --git a/src/com/massivecraft/factions/cmd/type/TypeMPermable.java b/src/com/massivecraft/factions/cmd/type/TypeMPermable.java index f0b498c8..96ac07bc 100644 --- a/src/com/massivecraft/factions/cmd/type/TypeMPermable.java +++ b/src/com/massivecraft/factions/cmd/type/TypeMPermable.java @@ -117,7 +117,7 @@ public class TypeMPermable extends TypeAbstract ret.addAll(TypeFaction.get().getTabList(sender, arg)); // Faction specific ranks - if (arg.length() >= 3) + if (arg.length() >= 2) { for (var f : FactionColl.get().getAll()) {