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
This commit is contained in:
Magnus Ulf 2018-12-29 19:24:56 +01:00
parent 56370bfab2
commit 2bfe2bdc75
3 changed files with 6 additions and 3 deletions

View File

@ -63,7 +63,8 @@ permissions:
factions.perm: {description: change faction permissions, default: false} factions.perm: {description: change faction permissions, default: false}
factions.perm.list: {description: list perms, default: false} factions.perm.list: {description: list perms, default: false}
factions.perm.set: {description: set 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.player: {description: show player information}
factions.powerboost: {description: manage powerboost, default: false} factions.powerboost: {description: manage powerboost, default: false}
factions.powerboost.faction: {description: show faction powerboost, default: false} factions.powerboost.faction: {description: show faction powerboost, default: false}
@ -162,6 +163,7 @@ permissions:
factions.perm.list: true factions.perm.list: true
factions.perm.set: true factions.perm.set: true
factions.perm.show: true factions.perm.show: true
factions.perm.show2: true
factions.player: true factions.player: true
factions.powerboost: true factions.powerboost: true
factions.powerboost.faction: true factions.powerboost.faction: true
@ -283,6 +285,7 @@ permissions:
factions.perm.list: true factions.perm.list: true
factions.perm.set: true factions.perm.set: true
factions.perm.show: true factions.perm.show: true
factions.perm.show2: true
factions.player: true factions.player: true
factions.promote: true factions.promote: true
factions.powerboost: true factions.powerboost: true

View File

@ -55,7 +55,7 @@ public class CmdFactionsPermShow extends FactionsCommand
String permableNames = Txt.implodeCommaAnd(permableList, Txt.parse("<i>")); String permableNames = Txt.implodeCommaAnd(permableList, Txt.parse("<i>"));
// Create messages // Create messages
msg("<i>In <reset>%s <i>permission <h>%s <i>is granted to <reset>%s<i>.", faction.describeTo(msender), mperm.getName(), permableNames); msg("<i>In <reset>%s <i>permission <reset>%s <i>is granted to <reset>%s<i>.", faction.describeTo(msender), mperm.getDesc(true, false), permableNames);
} }
public static MPerm.MPermable idToMPermable(String id) public static MPerm.MPermable idToMPermable(String id)

View File

@ -117,7 +117,7 @@ public class TypeMPermable extends TypeAbstract<MPerm.MPermable>
ret.addAll(TypeFaction.get().getTabList(sender, arg)); ret.addAll(TypeFaction.get().getTabList(sender, arg));
// Faction specific ranks // Faction specific ranks
if (arg.length() >= 3) if (arg.length() >= 2)
{ {
for (var f : FactionColl.get().getAll()) for (var f : FactionColl.get().getAll())
{ {